#36415 Fix grouping panel usage when column of composite type with ne…

…sted composite type is filtered
dbeaver · Dec 13, 2024 · 86cd497 · 86cd497
1 parent f84ffc8
commit 86cd497
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...ins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLGroupingAttribute.java b/...ins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLGroupingAttribute.java
@@ -199,6 +199,7 @@ public String prepareSqlString(@Nullable String subqueryAlias) {
                 this.getDataSource(),
                 subqueryAlias,
                 new DBDAttributeConstraint(this.binding),
+                subqueryAlias != null,
                 subqueryAlias != null
             );
         }

diff --git a/...rg.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLGroupingQueryGenerator.java b/...rg.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLGroupingQueryGenerator.java
@@ -133,7 +133,11 @@ public String generateGroupingQuery(String queryText) throws DBException {
 
                     SQLDialect sqlDialect = dataSource.getSQLDialect();
                     if (select.getFromItem() instanceof Table table) {
-                        select.setFromItem(new FormattedTable(table, sqlDialect));
+                        FormattedTable formattedTable = new FormattedTable(table, sqlDialect);
+                        // implicitly parsed where-conditions might have use table alias if presented,
+                        // so don't forget it while replacing the table reference
+                        formattedTable.setAlias(table.getAlias());
+                        select.setFromItem(formattedTable);
                     }
 
                     List<SelectItem> selectItems = new ArrayList<>();

diff --git a/....dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/StandardSQLDialectQueryGenerator.java b/....dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/StandardSQLDialectQueryGenerator.java
@@ -94,7 +94,7 @@ public void appendConditionString(
             // TODO: Would be nice to have some asserts here
 
             var names = constraints.stream()
-                .map(constraint -> getConstraintAttributeName(dataSource, conditionTable, constraint, subQuery))
+                .map(constraint -> getConstraintAttributeName(dataSource, conditionTable, constraint, subQuery, true))
                 .toList();
 
             var values = constraints.stream()
@@ -140,7 +140,7 @@ public void appendConditionString(
                     query.append('(');
                 }
 
-                String attrName = getConstraintAttributeName(dataSource, conditionTable, constraint, subQuery);
+                String attrName = getConstraintAttributeName(dataSource, conditionTable, constraint, subQuery, true);
                 if (constraint.getAttribute() != null) {
                     attrName = dataSource.getSQLDialect().getTypeCastClause(constraint.getAttribute(), attrName, true);
                 }
@@ -440,7 +440,8 @@ public static String getConstraintAttributeName(
         @NotNull DBPDataSource dataSource,
         @Nullable String conditionTable,
         @NotNull DBDAttributeConstraint constraint,
-        boolean subQuery
+        boolean subQuery,
+        boolean includeContainerName
     ) {
         // Attribute name could be an expression. So check if this is a real attribute
         // and generate full/quoted name for it.
@@ -451,7 +452,7 @@ public static String getConstraintAttributeName(
                 binding.getEntityAttribute().getName().equals(binding.getMetaAttribute().getName()) ||
                 binding instanceof DBDAttributeBindingType) {
                 if (binding.getEntityAttribute() instanceof DBSContextBoundAttribute entityAttribute) {
-                    return entityAttribute.formatMemberReference(true, conditionTable, DBPAttributeReferencePurpose.DATA_SELECTION);
+                    return entityAttribute.formatMemberReference(includeContainerName, conditionTable, DBPAttributeReferencePurpose.DATA_SELECTION);
                 } else {
                     return DBUtils.getObjectFullName(
                         dataSource,