From e8012cd8fdf8eaf5b54df7730c44662d1349dbeb Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Fri, 25 Nov 2022 11:50:16 +0100 Subject: [PATCH] [SAFRAN-1037] Database - validate view query - Fix validation should be case insensitive --- .../database/design/services/DatabaseServices.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services/DatabaseServices.java b/designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services/DatabaseServices.java index b5099466d..4b6d83c43 100644 --- a/designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services/DatabaseServices.java +++ b/designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services/DatabaseServices.java @@ -376,8 +376,8 @@ public static View updateViewContent(View view) { if(!StringUtils.isNullOrWhite(parsedColumn.getTable())) { Optional fromTableOpt = view.getTables().stream() - .filter(t -> parsedColumn.getTable().equals(t.getName()) || - parsedColumn.getTable().equals(t.getAlias())) + .filter(t -> parsedColumn.getTable().equalsIgnoreCase(t.getName()) || + parsedColumn.getTable().equalsIgnoreCase(t.getAlias())) .findFirst(); if(fromTableOpt.isPresent()) { viewColumn.setFrom(fromTableOpt.get()); @@ -416,14 +416,14 @@ private static ViewTable computeViewTableFromViewColumn(ViewColumn viewColumn) { .map(DatabaseServices::findTable) .filter(Objects::nonNull) .flatMap(t -> t.getColumns().stream()) - .filter(c -> viewColumn.getName().equals(c.getName())) + .filter(c -> viewColumn.getName().equalsIgnoreCase(c.getName())) .findFirst().orElse(null); // And finally crawl to the View Table if(column != null) { Table table = column.getOwner(); return view.getTables().stream() - .filter(vt -> vt.getName().equals(table.getName())).findFirst().orElse(null); + .filter(vt -> vt.getName().equalsIgnoreCase(table.getName())).findFirst().orElse(null); } return null; @@ -470,7 +470,7 @@ private static Table findTable(ViewTable viewTable) { TableContainer tableContainer = EObjectUtils.getContainer(viewTable, TableContainer.class); return tableContainer.getTables().stream() .filter(Table.class::isInstance).map(Table.class::cast) - .filter(t -> viewTable.getName().equals(t.getName())) + .filter(t -> viewTable.getName().equalsIgnoreCase(t.getName())) .findFirst().orElse(null); } @@ -485,7 +485,7 @@ private static Column findColumn(ViewColumn viewColumn) { } return table.getColumns().stream() - .filter(c -> viewColumn.getName().equals(c.getName())) + .filter(c -> viewColumn.getName().equalsIgnoreCase(c.getName())) .findFirst().orElse(null); }