Skip to content

Commit

Permalink
[SAFRAN-1037] Database - validate view query - Fix validation should …
Browse files Browse the repository at this point in the history
…be case insensitive
  • Loading branch information
vrichard12 committed Nov 25, 2022
1 parent 16361fe commit e8012cd
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ public static View updateViewContent(View view) {

if(!StringUtils.isNullOrWhite(parsedColumn.getTable())) {
Optional<ViewTable> 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());
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down

0 comments on commit e8012cd

Please sign in to comment.