[jOOQ#5609] Better fix

gavioto · Oct 21, 2016 · a79e800 · a79e800
1 parent 6c0bc24
commit a79e800
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 19 deletions.
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -312,6 +312,9 @@ else if (j != null) {
                 catalog.setOutputCatalogToDefault(d.isOutputCatalogToDefault());
                 catalogs.add(catalog);
 
+                if (!StringUtils.isBlank(catalog.getInputCatalog()))
+                    catalogsEmpty = false;
+
                 // For convenience and backwards-compatibility, the schema configuration can be set also directly
                 // in the <database/> element
                 if (schemataEmpty) {
@@ -320,6 +323,9 @@ else if (j != null) {
                     schema.setOutputSchema(trim(d.getOutputSchema()));
                     schema.setOutputSchemaToDefault(d.isOutputSchemaToDefault());
                     catalog.getSchemata().add(schema);
+
+                    if (!StringUtils.isBlank(schema.getInputSchema()))
+                        schemataEmpty = false;
                 }
                 else {
                     catalog.getSchemata().addAll(schemata);

diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -480,25 +480,13 @@ public final List<String> getInputSchemata() {
             inputSchemata = new ArrayList<String>();
             inputSchemataPerCatalog = new LinkedHashMap<String, List<String>>();
 
-            // [#1312] [#5609] Allow for ommitting inputSchema configuration. Generate all schemata instead.
-            if (configuredSchemata.size() == 0 ||
-               (configuredSchemata.size() == 1 && StringUtils.isBlank(configuredSchemata.get(0).getInputSchema()))) {
-                try {
-                    for (SchemaDefinition schema : getSchemata0()) {
-                        inputSchemata.add(schema.getName());
-                        List<String> list = inputSchemataPerCatalog.get(schema.getCatalog().getName());
-
-                        if (list == null) {
-                            list = new ArrayList<String>();
-                            inputSchemataPerCatalog.put(schema.getCatalog().getName(), list);
-                        }
-
-                        list.add(schema.getName());
-                    }
-                }
-                catch (Exception e) {
-                    log.error("Could not load schemata", e);
-                }
+            // [#1312] Allow for ommitting inputSchema configuration. Generate all schemata instead.
+            if (configuredSchemata.size() == 1 && StringUtils.isBlank(configuredSchemata.get(0).getInputSchema())) {
+                initAllSchemata();
+            }
+            else if (configuredCatalogs.size() == 1 && StringUtils.isBlank(configuredCatalogs.get(0).getInputCatalog())
+                  && configuredCatalogs.get(0).getSchemata().size() == 1 && StringUtils.isBlank(configuredCatalogs.get(0).getSchemata().get(0).getInputSchema())) {
+                initAllSchemata();
             }
             else if (configuredCatalogs.isEmpty()) {
                 inputSchemataPerCatalog.put("", inputSchemata);
@@ -551,6 +539,25 @@ else if (configuredCatalogs.isEmpty()) {
         return inputSchemata;
     }
 
+    private void initAllSchemata() {
+        try {
+            for (SchemaDefinition schema : getSchemata0()) {
+                inputSchemata.add(schema.getName());
+                List<String> list = inputSchemataPerCatalog.get(schema.getCatalog().getName());
+
+                if (list == null) {
+                    list = new ArrayList<String>();
+                    inputSchemataPerCatalog.put(schema.getCatalog().getName(), list);
+                }
+
+                list.add(schema.getName());
+            }
+        }
+        catch (Exception e) {
+            log.error("Could not load schemata", e);
+        }
+    }
+
     @Override
     public final List<String> getInputSchemata(CatalogDefinition catalog) {
         return getInputSchemata(catalog.getInputName());