Data filter rendering fix

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

@@ -647,7 +647,7 @@ public class ResultSetModel {
     void updateDataFilter(DBDDataFilter filter)
     {
         for (DBDAttributeConstraint constraint : filter.getConstraints()) {
-            DBDAttributeConstraint filterConstraint = this.dataFilter.getConstraint(constraint.getAttribute(), metadataChanged);
+            DBDAttributeConstraint filterConstraint = this.dataFilter.getConstraint(constraint.getAttribute(), true);
             if (filterConstraint == null) {
                 //log.warn("Constraint for attribute [" + constraint.getAttribute().getName() + "] not found");
                 continue;

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

@@ -449,11 +449,9 @@ public class ResultSetViewer extends Viewer
     public void setDataFilter(final DBDDataFilter dataFilter, boolean refreshData)
     {
         if (!model.getDataFilter().equalFilters(dataFilter)) {
-            if (model.setDataFilter(dataFilter)) {
-                redrawData(true);
-            }
+            //model.setDataFilter(dataFilter);
             if (refreshData) {
-                refreshData(null);
+                refreshWithFilter(dataFilter);
             } else {
                 activePresentation.formatData(true);
                 updateFiltersText();
@@ -2096,13 +2094,12 @@ public class ResultSetViewer extends Viewer
             if (operator.getArgumentCount() > 0 && value == null) {
                 return;
             }
-            DBDDataFilter filter = model.getDataFilter();
+            DBDDataFilter filter = new DBDDataFilter(model.getDataFilter());
             DBDAttributeConstraint constraint = filter.getConstraint(attribute);
             if (constraint != null) {
                 constraint.setOperator(operator);
                 constraint.setValue(value);
-                updateFiltersText();
-                refresh();
+                setDataFilter(filter, true);
             }
         }
     }
@@ -2118,11 +2115,11 @@ public class ResultSetViewer extends Viewer
         @Override
         public void run()
         {
-            DBDAttributeConstraint constraint = model.getDataFilter().getConstraint(attribute);
+            DBDDataFilter dataFilter = new DBDDataFilter(model.getDataFilter());
+            DBDAttributeConstraint constraint = dataFilter.getConstraint(attribute);
             if (constraint != null) {
                 constraint.setCriteria(null);
-                updateFiltersText();
-                refresh();
+                setDataFilter(dataFilter, true);
             }
         }
     }