From a70fe184c2a50a05701e4a8ec518503dda8260d7 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Tue, 19 Jan 2016 09:56:27 +1300 Subject: [PATCH] #533 - DDL - Invalid foreign key constraint name for @ManyToMany when using explicit schema in @Table - Fix --- .../ebean/dbmigration/model/build/ModelBuildContext.java | 4 ++++ .../dbmigration/model/build/ModelBuildIntersectionTable.java | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java index 0f20e7ee5..965985851 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildContext.java @@ -43,6 +43,10 @@ public class ModelBuildContext { model.adjustDraftReferences(); } + public String normaliseTable(String baseTable) { + return constraintNaming.normaliseTable(baseTable); + } + public String primaryKeyName(String tableName) { return maxLength(constraintNaming.primaryKeyName(tableName), 0); } diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java index 97c24633b..d895bcbb4 100644 --- a/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/src/main/java/com/avaje/ebean/dbmigration/model/build/ModelBuildIntersectionTable.java @@ -64,8 +64,7 @@ public class ModelBuildIntersectionTable { private void buildFkConstraints(BeanDescriptor desc, TableJoinColumn[] columns, boolean direction) { String tableName = intersectionTableJoin.getTable(); - String baseTable = desc.getBaseTable(); - + String baseTable = ctx.normaliseTable(desc.getBaseTable()); String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, ++countForeignKey); String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, countForeignKey);