#1897 - Indexes names, like index, unique, primary and foreign keys does not honor ebean.allQuotedIdentifiers (#1898)

src/main/java/io/ebean/config/DbConstraintNaming.java

@@ -88,7 +88,6 @@ public class DbConstraintNaming {
    * Return the primary key constraint name.
    */
   public String primaryKeyName(String tableName) {
-
     return pkPrefix + normaliseTable(tableName) + pkSuffix;
   }
 
@@ -103,7 +102,6 @@ public class DbConstraintNaming {
    * Return the index name associated with a foreign key constraint given multiple columns.
    */
   public String foreignKeyIndexName(String tableName, String[] columns) {
-
     String colPart = joinColumnNames(columns);
     return fkIndexPrefix + normaliseTable(tableName) + fkIndexMiddle + colPart + fkIndexSuffix;
   }
@@ -112,7 +110,6 @@ public class DbConstraintNaming {
    * Return the index name associated with a foreign key constraint given a single column foreign key.
    */
   public String foreignKeyIndexName(String tableName, String column) {
-
     String colPart = normaliseTable(column);
     return fkIndexPrefix + normaliseTable(tableName) + fkIndexMiddle + colPart + fkIndexSuffix;
   }
@@ -121,7 +118,6 @@ public class DbConstraintNaming {
    * Return the index name for a general index (not associated with a foreign key).
    */
   public String indexName(String tableName, String column) {
-
     String colPart = normaliseTable(column);
     return indexPrefix + normaliseTable(tableName) + indexMiddle + colPart + indexSuffix;
   }
@@ -130,7 +126,6 @@ public class DbConstraintNaming {
    * Return the index name for a general index (not associated with a foreign key).
    */
   public String indexName(String tableName, String[] columns) {
-
     String colPart = joinColumnNames(columns);
     return indexPrefix + normaliseTable(tableName) + indexMiddle + colPart + indexSuffix;
   }
@@ -139,7 +134,6 @@ public class DbConstraintNaming {
    * Join the column names together with underscores.
    */
   protected String joinColumnNames(String[] columns) {
-
     if (columns.length == 1) {
       return normaliseColumn(columns[0]);
     }
@@ -157,7 +151,6 @@ public class DbConstraintNaming {
    * Return the unique constraint name.
    */
   public String uniqueConstraintName(String tableName, String columnName) {
-
     return uqPrefix + normaliseTable(tableName) + "_" + normaliseColumn(columnName) + uqSuffix;
   }
 
@@ -165,7 +158,6 @@ public class DbConstraintNaming {
    * Return the unique constraint name.
    */
   public String uniqueConstraintName(String tableName, String[] columns) {
-
     String colPart = joinColumnNames(columns);
     return uqPrefix + normaliseTable(tableName) + "_" + colPart + uqSuffix;
   }
@@ -174,7 +166,6 @@ public class DbConstraintNaming {
    * Return the check constraint name.
    */
   public String checkConstraintName(String tableName, String columnName) {
-
     return ckPrefix + normaliseTable(tableName) + "_" + normaliseColumn(columnName) + ckSuffix;
   }
 

src/main/java/io/ebean/config/PlatformConfig.java

@@ -17,6 +17,13 @@ public class PlatformConfig {
 
   private boolean allQuotedIdentifiers;
 
+  private DbConstraintNaming constraintNaming;
+
+  /**
+   * Flag set when a supplied constraintNaming is used.
+   */
+  private boolean customConstraintNaming;
+
   /**
    * The database boolean true value (typically either 1, T, or Y).
    */
@@ -63,7 +70,7 @@ public class PlatformConfig {
    * Construct with defaults.
    */
   public PlatformConfig() {
-
+    this.constraintNaming = new DbConstraintNaming();
   }
 
   /**
@@ -80,6 +87,19 @@ public class PlatformConfig {
     this.allQuotedIdentifiers = platformConfig.allQuotedIdentifiers;
     this.databaseInetAddressVarchar = platformConfig.databaseInetAddressVarchar;
     this.customDbTypeMappings = platformConfig.customDbTypeMappings;
+    this.constraintNaming = new DbConstraintNaming(!allQuotedIdentifiers);
+  }
+
+  public DbConstraintNaming getConstraintNaming() {
+    return constraintNaming;
+  }
+
+  /**
+   * Set a custom database constraint naming convention.
+   */
+  public void setConstraintNaming(DbConstraintNaming constraintNaming) {
+    this.customConstraintNaming = true;
+    this.constraintNaming = constraintNaming;
   }
 
   /**
@@ -94,6 +114,9 @@ public class PlatformConfig {
    */
   public void setAllQuotedIdentifiers(boolean allQuotedIdentifiers) {
     this.allQuotedIdentifiers = allQuotedIdentifiers;
+    if (!customConstraintNaming) {
+      this.constraintNaming = new DbConstraintNaming(!allQuotedIdentifiers);
+    }
   }
 
   /**

src/main/java/io/ebean/config/ServerConfig.java

@@ -353,11 +353,6 @@ public class ServerConfig {
    */
   private NamingConvention namingConvention = new UnderscoreNamingConvention();
 
-  /**
-   * Naming convention used in DDL generation for primary keys, foreign keys etc.
-   */
-  private DbConstraintNaming constraintNaming = new DbConstraintNaming();
-
   /**
    * Behaviour of updates in JDBC batch to by default include all properties.
    */
@@ -1609,14 +1604,14 @@ public class ServerConfig {
    * Return the constraint naming convention used in DDL generation.
    */
   public DbConstraintNaming getConstraintNaming() {
-    return constraintNaming;
+    return platformConfig.getConstraintNaming();
   }
 
   /**
    * Set the constraint naming convention used in DDL generation.
    */
   public void setConstraintNaming(DbConstraintNaming constraintNaming) {
-    this.constraintNaming = constraintNaming;
+    platformConfig.setConstraintNaming(constraintNaming);
   }
 
   /**

src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java

@@ -1,11 +1,11 @@
 package io.ebeaninternal.dbmigration.model;
 
 import io.ebean.config.DbConstraintNaming;
+import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlHandler;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite;
-import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
 import io.ebeaninternal.dbmigration.migration.ChangeSet;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildBeanVisitor;
 import io.ebeaninternal.dbmigration.model.build.ModelBuildContext;
@@ -24,9 +24,9 @@ public class CurrentModel {
 
   private final SpiEbeanServer server;
 
-  private final DbConstraintNaming constraintNaming;
+  private final DatabasePlatform databasePlatform;
 
-  private final DbConstraintNaming.MaxLength maxLength;
+  private final DbConstraintNaming constraintNaming;
 
   private final boolean platformTypes;
 
@@ -60,8 +60,8 @@ public class CurrentModel {
 
   private CurrentModel(SpiEbeanServer server, DbConstraintNaming constraintNaming, boolean platformTypes) {
     this.server = server;
+    this.databasePlatform = server.getDatabasePlatform();
     this.constraintNaming = constraintNaming;
-    this.maxLength = maxLength(server, constraintNaming);
     this.platformTypes = platformTypes;
     this.jaxbPresent = server.getServerConfig().getClassLoadConfig().isJavaxJAXBPresent();
   }
@@ -84,16 +84,6 @@ public class CurrentModel {
     return read().getPartitionedTables();
   }
 
-  private static DbConstraintNaming.MaxLength maxLength(SpiEbeanServer server, DbConstraintNaming naming) {
-
-    if (naming.getMaxLength() != null) {
-      return naming.getMaxLength();
-    }
-
-    int maxConstraintNameLength = server.getDatabasePlatform().getMaxConstraintNameLength();
-    return new DefaultConstraintMaxLength(maxConstraintNameLength);
-  }
-
   /**
    * Return the current model by reading all the bean descriptors and properties.
    */
@@ -101,7 +91,7 @@ public class CurrentModel {
     if (model == null) {
       model = new ModelContainer();
 
-      ModelBuildContext context = new ModelBuildContext(model, constraintNaming, maxLength, platformTypes);
+      ModelBuildContext context = new ModelBuildContext(model, databasePlatform, constraintNaming, platformTypes);
       ModelBuildBeanVisitor visitor = new ModelBuildBeanVisitor(context);
       VisitAllUsing visit = new VisitAllUsing(visitor, server);
       visit.visitAllBeans();

src/main/java/io/ebeaninternal/dbmigration/model/MTable.java

@@ -443,6 +443,10 @@ public class MTable {
     return partitionMeta;
   }
 
+  public String getPkName() {
+    return pkName;
+  }
+
   public void setPkName(String pkName) {
     this.pkName = pkName;
   }

src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java

@@ -1,8 +1,10 @@
 package io.ebeaninternal.dbmigration.model.build;
 
 import io.ebean.config.DbConstraintNaming;
+import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.DbPlatformType;
 import io.ebean.config.dbplatform.DbPlatformTypeMapping;
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DefaultConstraintMaxLength;
 import io.ebeaninternal.dbmigration.model.MColumn;
 import io.ebeaninternal.dbmigration.model.MCompoundForeignKey;
 import io.ebeaninternal.dbmigration.model.MTable;
@@ -30,17 +32,30 @@ public class ModelBuildContext {
 
   private final ModelContainer model;
 
+  private final DatabasePlatform databasePlatform;
+
   private final DbConstraintNaming constraintNaming;
 
   private final DbConstraintNaming.MaxLength maxLength;
 
   private final boolean platformTypes;
 
-  public ModelBuildContext(ModelContainer model, DbConstraintNaming naming, DbConstraintNaming.MaxLength maxLength, boolean platformTypes) {
+  public ModelBuildContext(ModelContainer model, DatabasePlatform databasePlatform, DbConstraintNaming naming, boolean platformTypes) {
     this.model = model;
+    this.databasePlatform = databasePlatform;
     this.constraintNaming = naming;
-    this.maxLength = maxLength;
     this.platformTypes = platformTypes;
+    this.maxLength = maxLength();
+  }
+
+  /**
+   * Create the max length handling for constraint names.
+   */
+  private DbConstraintNaming.MaxLength maxLength() {
+    if (constraintNaming.getMaxLength() != null) {
+      return constraintNaming.getMaxLength();
+    }
+    return new DefaultConstraintMaxLength(databasePlatform.getMaxConstraintNameLength());
   }
 
   /**
@@ -55,40 +70,51 @@ public class ModelBuildContext {
     return constraintNaming.normaliseTable(baseTable);
   }
 
+  /**
+   * Take into account max length and quoted identifiers in constraint and index names.
+   */
+  private String name(String constraintName, int indexCount) {
+    return databasePlatform.convertQuotedIdentifiers(maxLength(constraintName, indexCount));
+  }
+
+  private String maxLength(String constraintName, int indexCount) {
+    return maxLength.maxLength(constraintName, indexCount);
+  }
+
   public String primaryKeyName(String tableName) {
-    return maxLength(constraintNaming.primaryKeyName(tableName), 0);
+    return name(constraintNaming.primaryKeyName(tableName), 0);
   }
 
   public String foreignKeyConstraintName(String tableName, String columnName, int foreignKeyCount) {
-    return maxLength(constraintNaming.foreignKeyConstraintName(tableName, columnName), foreignKeyCount);
+    return name(constraintNaming.foreignKeyConstraintName(tableName, columnName), foreignKeyCount);
   }
 
   public String foreignKeyIndexName(String tableName, String[] columns, int indexCount) {
-    return maxLength(constraintNaming.foreignKeyIndexName(tableName, columns), indexCount);
+    return name(constraintNaming.foreignKeyIndexName(tableName, columns), indexCount);
   }
 
   public String foreignKeyIndexName(String tableName, String column, int indexCount) {
-    return maxLength(constraintNaming.foreignKeyIndexName(tableName, column), indexCount);
+    return name(constraintNaming.foreignKeyIndexName(tableName, column), indexCount);
   }
 
   public String indexName(String tableName, String column, int indexCount) {
-    return maxLength(constraintNaming.indexName(tableName, column), indexCount);
+    return name(constraintNaming.indexName(tableName, column), indexCount);
   }
 
   public String indexName(String tableName, String[] columns, int indexCount) {
-    return maxLength(constraintNaming.indexName(tableName, columns), indexCount);
+    return name(constraintNaming.indexName(tableName, columns), indexCount);
   }
 
   public String uniqueConstraintName(String tableName, String columnName, int indexCount) {
-    return maxLength(constraintNaming.uniqueConstraintName(tableName, columnName), indexCount);
+    return name(constraintNaming.uniqueConstraintName(tableName, columnName), indexCount);
   }
 
   public String uniqueConstraintName(String tableName, String[] columnNames, int indexCount) {
-    return maxLength(constraintNaming.uniqueConstraintName(tableName, columnNames), indexCount);
+    return name(constraintNaming.uniqueConstraintName(tableName, columnNames), indexCount);
   }
 
   public String checkConstraintName(String tableName, String columnName, int checkCount) {
-    return maxLength(constraintNaming.checkConstraintName(tableName, columnName), checkCount);
+    return name(constraintNaming.checkConstraintName(tableName, columnName), checkCount);
   }
 
   public MTable addTable(MTable table) {
@@ -107,10 +133,6 @@ public class ModelBuildContext {
     model.addIndex(indexName, tableName, columnNames);
   }
 
-  private String maxLength(String constraintName, int indexCount) {
-    return maxLength.maxLength(constraintName, indexCount);
-  }
-
   /**
    * Return the map used to determine the DB specific type
    * for a given bean property.

src/main/java/io/ebeaninternal/server/deploy/TableJoinColumn.java

@@ -40,7 +40,6 @@ public class TableJoinColumn {
     this.foreignDbColumn = InternString.intern(deploy.getForeignDbColumn());
     this.localSqlFormula = InternString.intern(deploy.getLocalSqlFormula());
     this.foreignSqlFormula = InternString.intern(deploy.getForeignSqlFormula());
-
     this.insertable = deploy.isInsertable();
     this.updateable = deploy.isUpdateable();
     this.queryHash = hash();