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

#3421 Generic driver auto-complete fix


Former-commit-id: dff60f7c
上级 ee56bb5c
......@@ -97,8 +97,8 @@ public class GenericStructureAssistant extends JDBCStructureAssistant
final GenericMetaObject tableObject = getDataSource().getMetaObject(GenericConstants.OBJECT_TABLE);
final DBRProgressMonitor monitor = session.getProgressMonitor();
try (JDBCResultSet dbResult = session.getMetaData().getTables(
catalog == null ? dataSource.getAllObjectsPattern() : catalog.getName(),
schema == null ? dataSource.getAllObjectsPattern() : schema.getName(),
catalog == null ? null : catalog.getName(),
schema == null ? null : schema.getName(),
tableNameMask,
null)) {
while (dbResult.next()) {
......@@ -128,8 +128,8 @@ public class GenericStructureAssistant extends JDBCStructureAssistant
final GenericMetaObject procObject = getDataSource().getMetaObject(GenericConstants.OBJECT_PROCEDURE);
DBRProgressMonitor monitor = session.getProgressMonitor();
try (JDBCResultSet dbResult = session.getMetaData().getProcedures(
catalog == null ? dataSource.getAllObjectsPattern() : catalog.getName(),
schema == null ? dataSource.getAllObjectsPattern() : schema.getName(),
catalog == null ? null : catalog.getName(),
schema == null ? null : schema.getName(),
procNameMask)) {
while (dbResult.next()) {
if (monitor.isCanceled()) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册