[2032] Added first implementation draft working with SQL Server

jOOQ · Dec 10, 2015 · e2b4d09 · e2b4d09
1 parent c9900d6
commit e2b4d09
Show file tree

Hide file tree

Showing 19 changed files with 449 additions and 84 deletions.
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java
@@ -136,44 +136,56 @@ public String getJavaPackageName(Definition definition, Mode mode) {
 
         sb.append(getTargetPackage());
 
-        // [#282] In multi-schema setups, the schema name goes into the package
-        if (definition.getDatabase().getSchemata().size() > 1) {
+        // [#2032] In multi-catalog setups, the catalog name goes into the package
+        if (definition.getDatabase().getCatalogs().size() > 1) {
             sb.append(".");
-            sb.append(getJavaIdentifier(definition.getSchema()).toLowerCase());
+            sb.append(getJavaIdentifier(definition.getCatalog()).toLowerCase());
         }
 
-        // Some definitions have their dedicated subpackages, e.g. "tables", "routines"
-        if (!StringUtils.isBlank(getSubPackage(definition))) {
-            sb.append(".");
-            sb.append(getSubPackage(definition));
-        }
-
-        // Record are yet in another subpackage
-        if (mode == Mode.RECORD) {
-            sb.append(".records");
-        }
-
-        // POJOs too
-        else if (mode == Mode.POJO) {
-            sb.append(".pojos");
-        }
+        if (!(definition instanceof CatalogDefinition)) {
 
-        // DAOs too
-        else if (mode == Mode.DAO) {
-            sb.append(".daos");
-        }
+            // [#282] In multi-schema setups, the schema name goes into the package
+            if (definition.getDatabase().getSchemata().size() > 1) {
+                sb.append(".");
+                sb.append(getJavaIdentifier(definition.getSchema()).toLowerCase());
+            }
 
-        // Interfaces too
-        else if (mode == Mode.INTERFACE) {
-            sb.append(".interfaces");
+            if (!(definition instanceof SchemaDefinition)) {
+
+                // Some definitions have their dedicated subpackages, e.g. "tables", "routines"
+                if (!StringUtils.isBlank(getSubPackage(definition))) {
+                    sb.append(".");
+                    sb.append(getSubPackage(definition));
+                }
+
+                // Record are yet in another subpackage
+                if (mode == Mode.RECORD) {
+                    sb.append(".records");
+                }
+
+                // POJOs too
+                else if (mode == Mode.POJO) {
+                    sb.append(".pojos");
+                }
+
+                // DAOs too
+                else if (mode == Mode.DAO) {
+                    sb.append(".daos");
+                }
+
+                // Interfaces too
+                else if (mode == Mode.INTERFACE) {
+                    sb.append(".interfaces");
+                }
+
+                /* [pro] xx
+                xxxx xx xxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x
+                    xxxxxxxxxxxxxxxxx
+                x
+                xx [/pro] */
+            }
         }
 
-        /* [pro] xx
-        xxxx xx xxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxx x
-            xxxxxxxxxxxxxxxxx
-        x
-        xx [/pro] */
-
         return sb.toString();
     }