From 93ece30335883779a0519086be735a94eaced022 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 28 Aug 2018 14:32:16 +0200 Subject: [PATCH] [#5538] Compilation error in Keys.java when two tables contain the same (unique) index name in SQL Server --- .../java/org/jooq/codegen/DefaultGeneratorStrategy.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java index cccd3467ae..a5a950621e 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/DefaultGeneratorStrategy.java @@ -59,6 +59,7 @@ import org.jooq.meta.RoutineDefinition; import org.jooq.meta.SchemaDefinition; import org.jooq.meta.TableDefinition; import org.jooq.meta.UDTDefinition; +import org.jooq.meta.UniqueKeyDefinition; // ... import org.jooq.tools.StringUtils; @@ -138,6 +139,13 @@ public class DefaultGeneratorStrategy extends AbstractGeneratorStrategy { // In order to have non-ambiguous identifiers, we need to include the table name. else if (definition instanceof IndexDefinition && asList(MYSQL, MARIADB).contains(definition.getDatabase().getDialect().family())) return ((IndexDefinition) definition).getTable().getOutputName().toUpperCase() + "_" + definition.getOutputName().toUpperCase(); + + + + + + + else return definition.getOutputName().toUpperCase(); }