[#5557] Compilation error when generated catalog and one of its contained schemas have the same name

2016-09-21 12:46:50 +02:00 · 2016-09-21 12:46:50 +02:00 · 631b91a16f
commit 631b91a16f
parent 91a2f0eaf2
1 changed files with 8 additions and 0 deletions
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategyWrapper.java
@ -150,6 +150,14 @@ class GeneratorStrategyWrapper extends AbstractGeneratorStrategy {
                return identifier + "_";
        }

+        // [#5557] Once more, this causes issues...
+        else if (definition instanceof SchemaDefinition) {
+            CatalogDefinition catalog = definition.getCatalog();
+
+            if (identifier.equals(getJavaIdentifier(catalog)))
+                return identifier + "_";
+        }
+
        return identifier;
    }