From 808f6ad866acfcc2acb987e38cadfb0576d523af Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Thu, 30 Aug 2018 23:28:53 +0300
Subject: [PATCH] #1790 Default schema list loading enhancement

Former-commit-id: f48b56f9fbf0e9211edc63fb75add9cdb43a4434
---
 .../connection/ConnectionPageInitialization.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
index ef11bc9924..8ccd993d1f 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageInitialization.java
@@ -55,10 +55,7 @@ import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPConnectionType;
 import org.jkiss.dbeaver.model.runtime.AbstractJob;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.model.struct.DBSEntityAttribute;
-import org.jkiss.dbeaver.model.struct.DBSObject;
-import org.jkiss.dbeaver.model.struct.DBSObjectContainer;
-import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
+import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
 import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
 import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
@@ -169,7 +166,14 @@ class ConnectionPageInitialization extends ConnectionWizardPage {
                         }
                     }
                     if (dataSource instanceof DBSObjectContainer) {
-                        new SchemaReadJob((DBSObjectContainer) dataSource).schedule();
+                        DBSObjectContainer schemaContainer = (DBSObjectContainer) dataSource;
+                        if (dataSource instanceof DBSObjectSelector) {
+                            DBSObject defaultObject = ((DBSObjectSelector) dataSource).getDefaultObject();
+                            if (defaultObject instanceof DBSObjectContainer) {
+                                schemaContainer = (DBSObjectContainer) defaultObject;
+                            }
+                        }
+                        new SchemaReadJob(schemaContainer).schedule();
                     }
                 } else {
                     isolationLevel.setEnabled(false);
-- 
GitLab