From 6d76b254f0be392e146ffb7d60479ea4a715aaaf Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Sun, 9 Aug 2020 17:37:36 +0300
Subject: [PATCH] #5983 SQL Server: use synonyms in schema child objects search

---
 .../jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
index c43b725dbd..845ef3f1ba 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
+++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java
@@ -230,8 +230,11 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi
     }
 
     @Override
-    public Collection<? extends SQLServerTableBase> getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
-        return tableCache.getAllObjects(monitor, this);
+    public List<SQLServerObject> getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
+        List<SQLServerObject> result = new ArrayList<>();
+        result.addAll(tableCache.getAllObjects(monitor, this));
+        result.addAll(synonymCache.getAllObjects(monitor, this));
+        return result;
     }
 
     @Override
@@ -248,6 +251,7 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi
     public void cacheStructure(@NotNull DBRProgressMonitor monitor, int scope) throws DBException {
         if ((scope & STRUCT_ENTITIES) == STRUCT_ENTITIES) {
             tableCache.getAllObjects(monitor, this);
+            synonymCache.getAllObjects(monitor, this);
         }
         if ((scope & STRUCT_ATTRIBUTES) == STRUCT_ATTRIBUTES) {
             tableCache.getChildren(monitor, this, null);
-- 
GitLab