From bd91df22350c10cc7094dce975e92a376c096963 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Fri, 23 Jul 2021 15:16:29 +0300 Subject: [PATCH] CB-1065 Data filters improve (support document-based databases) --- .../src/io/cloudbeaver/service/sql/WebSQLDataFilter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataFilter.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataFilter.java index b26937f588..77199942fa 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataFilter.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLDataFilter.java @@ -17,8 +17,6 @@ package io.cloudbeaver.service.sql; import org.jkiss.dbeaver.DBException; -import org.jkiss.dbeaver.model.DBPEvaluationContext; -import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.data.DBDAttributeConstraint; import org.jkiss.dbeaver.model.data.DBDDataFilter; import org.jkiss.dbeaver.model.exec.DBCLogicalOperator; @@ -106,9 +104,10 @@ public class WebSQLDataFilter { if (dataContainer instanceof DBSEntity) { DBSEntityAttribute attribute = ((DBSEntity) dataContainer).getAttribute(monitor, webConstr.getAttribute()); if (attribute == null) { - throw new DBException("Attribute '" + webConstr.getAttribute() + "' not found in '" + DBUtils.getObjectFullName(dataContainer, DBPEvaluationContext.UI) + "'"); + dbConstraint = new DBDAttributeConstraint(webConstr.getAttribute(), -1); + } else { + dbConstraint = new DBDAttributeConstraint(attribute, -1); } - dbConstraint = new DBDAttributeConstraint(attribute, -1); } else { dbConstraint = new DBDAttributeConstraint(webConstr.getAttribute(), -1); }