From 5178b76431c7fadfe99a3f4d9bca7ffa3604a9e8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 20 Oct 2021 20:07:54 +1300 Subject: [PATCH] Update internals migrate from deprecated methods baseTable() --- .../dbmigration/model/build/ModelBuildContext.java | 4 ++-- .../dbmigration/model/build/ModelBuildPropertyVisitor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java index 939592942..a20874497 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildContext.java @@ -243,11 +243,11 @@ public class ModelBuildContext { */ public FkeyBuilder addForeignKey(BeanDescriptor desc, TableJoin tableJoin, boolean direction) { - String baseTable = ctx.normaliseTable(desc.getBaseTable()); + String baseTable = ctx.normaliseTable(desc.baseTable()); String fkName = ctx.foreignKeyConstraintName(tableName, baseTable, count.incrementAndGet()); String fkIndex = ctx.foreignKeyIndexName(tableName, baseTable, count.get()); - MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.getBaseTable(), fkIndex); + MCompoundForeignKey foreignKey = new MCompoundForeignKey(fkName, desc.baseTable(), fkIndex); for (TableJoinColumn column : tableJoin.columns()) { String localCol = direction ? column.getForeignDbColumn() : column.getLocalDbColumn(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java index 0a9f29eca..398bee86f 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildPropertyVisitor.java @@ -203,10 +203,10 @@ public class ModelBuildPropertyVisitor extends BaseTablePropertyVisitor { if (columns.length == 1) { if (p.hasForeignKeyConstraint() && !importedProperty.descriptor().suppressForeignKey()) { // single references column (put it on the column) - String refTable = importedProperty.descriptor().getBaseTable(); + String refTable = importedProperty.descriptor().baseTable(); if (refTable == null) { // odd case where an EmbeddedId only has 1 property - refTable = p.targetDescriptor().getBaseTable(); + refTable = p.targetDescriptor().baseTable(); } col.setReferences(refTable + "." + refColumn); col.setForeignKeyName(foreignKeyConstraintName(col.getName()));