From 3dcbade875d30492f56cd626a3c2ebba065ea370 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 15 Apr 2018 22:22:04 +0300
Subject: [PATCH] ERD diagram respects columns filtering

---
 .../src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
index a7e69de855..5d56fe8907 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
+++ b/plugins/org.jkiss.dbeaver.ext.erd/src/org/jkiss/dbeaver/ext/erd/model/ERDEntity.java
@@ -258,6 +258,7 @@ public class ERDEntity extends ERDObject<DBSEntity>
             }
             try {
 
+                DBSObjectFilter columnFilter = entity.getDataSource().getContainer().getObjectFilter(DBSEntityAttribute.class, entity, false);
                 Collection<? extends DBSEntityAttribute> attributes = entity.getAttributes(monitor);
                 if (!CommonUtils.isEmpty(attributes)) {
                     for (DBSEntityAttribute attribute : attributes) {
@@ -270,6 +271,10 @@ public class ERDEntity extends ERDObject<DBSEntity>
                             // Skip hidden attributes
                             continue;
                         }
+                        if (columnFilter != null && !columnFilter.matches(attribute.getName())) {
+                            continue;
+                        }
+
                         switch (attributeVisibility) {
                             case PRIMARY:
                                 if (idColumns == null || !idColumns.contains(attribute)) {
-- 
GitLab