Todo

Former-commit-id: 326da32f

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java

@@ -372,11 +372,11 @@ public class ResultSetUtils
     public static boolean equalAttributes(DBCAttributeMetaData attr1, DBCAttributeMetaData attr2) {
         return
             CommonUtils.equalObjects(attr1.getLabel(), attr2.getLabel()) &&
+            CommonUtils.equalObjects(attr1.getName(), attr2.getName()) &&
             CommonUtils.equalObjects(attr1.getEntityMetaData(), attr2.getEntityMetaData()) &&
             attr1.getOrdinalPosition() == attr2.getOrdinalPosition() &&
             attr1.isRequired() == attr2.isRequired() &&
             attr1.getMaxLength() == attr2.getMaxLength() &&
-            CommonUtils.equalObjects(attr1.getName(), attr2.getName()) &&
             attr1.getPrecision() == attr2.getPrecision() &&
             attr1.getScale() == attr2.getScale() &&
             attr1.getTypeID() == attr2.getTypeID() &&

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/parser/SQLSemanticProcessor.java

@@ -65,6 +65,8 @@ public class SQLSemanticProcessor {
         }
     }
 
+    // FIXME: Applying filters changes query formatting (thus it changes column names in expressions)
+    // FIXME: Solution - always wrap query in subselect + add patched WHERE and ORDER
     public static String addFiltersToQuery(final DBPDataSource dataSource, String sqlQuery, final DBDDataFilter dataFilter) {
         boolean supportSubqueries = dataSource instanceof SQLDataSource && ((SQLDataSource) dataSource).getSQLDialect().supportsSubqueries();
         try {