提交 808f6ad8 编写于 作者: S serge-rider

#1790 Default schema list loading enhancement


Former-commit-id: f48b56f9
上级 aa66c9b3
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册