From bf7d16983cba3869de65dac1f8988c32e62126ce Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Thu, 10 May 2018 20:33:03 +0300
Subject: [PATCH] #3421 Generic driver auto-complete fix

Former-commit-id: dff60f7c69938c0d696abc0ad563dca981e2766d
---
 .../ext/generic/model/GenericStructureAssistant.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericStructureAssistant.java b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericStructureAssistant.java
index 678132093e..5fca06ec94 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericStructureAssistant.java
+++ b/plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/GenericStructureAssistant.java
@@ -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()) {
-- 
GitLab