From 5eca42adc909d3c9f7ae247c5327483a6fba8dc5 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Tue, 28 Oct 2014 06:55:53 +0000
Subject: [PATCH] Dumper fix

---
 .../org/jkiss/dbeaver/registry/DriverDescriptor.java  | 11 +++++++++++
 .../src/org/jkiss/tools/jdbc/dumper/JDBCDumper.java   | 11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
index 7fddeefda9..449fbeaa2c 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java
@@ -900,6 +900,17 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
             }
         }
 
+/*
+        // Try to restore old disabled files
+        if (downloadCandidates.isEmpty() && isFailed) {
+            for (DriverFileDescriptor file : files) {
+                if (file.isDisabled() && !file.isCustom() && file.isLocal()) {
+                    file.setDisabled(false);
+                }
+            }
+        }
+*/
+
         if (!downloadCandidates.isEmpty()) {
             final StringBuilder libNames = new StringBuilder();
             for (DriverFileDescriptor lib : downloadCandidates) {
diff --git a/tools/jdbc-dumper/src/org/jkiss/tools/jdbc/dumper/JDBCDumper.java b/tools/jdbc-dumper/src/org/jkiss/tools/jdbc/dumper/JDBCDumper.java
index 41091e423a..2d84af4893 100644
--- a/tools/jdbc-dumper/src/org/jkiss/tools/jdbc/dumper/JDBCDumper.java
+++ b/tools/jdbc-dumper/src/org/jkiss/tools/jdbc/dumper/JDBCDumper.java
@@ -101,10 +101,17 @@ public class JDBCDumper
                     } catch (Throwable e) {
                         e.printStackTrace();
                     }
-                    if (schemas.isEmpty()) {
-                        schemas.add("%");
+                }
+                if (schemas.isEmpty() && catalogs.size() == 1) {
+                    try {
+                        schemas = dumpResultSetAndReturn(catalog + " Schemas", metaData.getSchemas(), "TABLE_SCHEM");
+                    } catch (Throwable e) {
+                        e.printStackTrace();
                     }
                 }
+                if (schemas.isEmpty()) {
+                    schemas.add("%");
+                }
                 for (final String schema : schemas) {
                     dumpResultSet("Tables of " + catalog + "." + schema, "", metaData.getTables(catalog, schema, "%", null),
                         new NestedFetcher() {
-- 
GitLab