Skip to content

Commit e8012cd

Browse files
committed
[SAFRAN-1037] Database - validate view query - Fix validation should be case insensitive
1 parent 16361fe commit e8012cd

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services

designs/database/plugins/org.obeonetwork.dsl.database.design/src/org/obeonetwork/dsl/database/design/services/DatabaseServices.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@ public static View updateViewContent(View view) {
376376

377377
if(!StringUtils.isNullOrWhite(parsedColumn.getTable())) {
378378
Optional<ViewTable> fromTableOpt = view.getTables().stream()
379-
.filter(t -> parsedColumn.getTable().equals(t.getName()) ||
380-
parsedColumn.getTable().equals(t.getAlias()))
379+
.filter(t -> parsedColumn.getTable().equalsIgnoreCase(t.getName()) ||
380+
parsedColumn.getTable().equalsIgnoreCase(t.getAlias()))
381381
.findFirst();
382382
if(fromTableOpt.isPresent()) {
383383
viewColumn.setFrom(fromTableOpt.get());
@@ -416,14 +416,14 @@ private static ViewTable computeViewTableFromViewColumn(ViewColumn viewColumn) {
416416
.map(DatabaseServices::findTable)
417417
.filter(Objects::nonNull)
418418
.flatMap(t -> t.getColumns().stream())
419-
.filter(c -> viewColumn.getName().equals(c.getName()))
419+
.filter(c -> viewColumn.getName().equalsIgnoreCase(c.getName()))
420420
.findFirst().orElse(null);
421421

422422
// And finally crawl to the View Table
423423
if(column != null) {
424424
Table table = column.getOwner();
425425
return view.getTables().stream()
426-
.filter(vt -> vt.getName().equals(table.getName())).findFirst().orElse(null);
426+
.filter(vt -> vt.getName().equalsIgnoreCase(table.getName())).findFirst().orElse(null);
427427
}
428428

429429
return null;
@@ -470,7 +470,7 @@ private static Table findTable(ViewTable viewTable) {
470470
TableContainer tableContainer = EObjectUtils.getContainer(viewTable, TableContainer.class);
471471
return tableContainer.getTables().stream()
472472
.filter(Table.class::isInstance).map(Table.class::cast)
473-
.filter(t -> viewTable.getName().equals(t.getName()))
473+
.filter(t -> viewTable.getName().equalsIgnoreCase(t.getName()))
474474
.findFirst().orElse(null);
475475
}
476476

@@ -485,7 +485,7 @@ private static Column findColumn(ViewColumn viewColumn) {
485485
}
486486

487487
return table.getColumns().stream()
488-
.filter(c -> viewColumn.getName().equals(c.getName()))
488+
.filter(c -> viewColumn.getName().equalsIgnoreCase(c.getName()))
489489
.findFirst().orElse(null);
490490
}
491491

0 commit comments

Comments
 (0)