From 3db9a17c6acaa5db9d805285b18b1b0d7924aa2e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 21 Mar 2022 11:15:13 +0100 Subject: [PATCH] Refactored DbTriggerBasedHistory: always use historyTableName --- .../platform/DbTriggerBasedHistoryDdl.java | 34 +++++++++---------- .../dbmigration/model/MTable.java | 7 ++++ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index 0e6185781..ab8723609 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -127,11 +127,15 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { } protected String historyTableName(String baseTableName) { - return baseTableName + historySuffix; + return normalise(baseTableName) + historySuffix; + } + + protected String historyViewName(String baseTableName) { + return normalise(baseTableName) + viewSuffix; } protected String procedureName(String baseTableName) { - return baseTableName + "_history_version"; + return normalise(baseTableName) + "_history_version"; } protected String triggerName(String baseTableName) { @@ -146,16 +150,6 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { return normalise(baseTableName) + "_history_del"; } - protected void addHistoryTable(DdlWrite writer, MTable table, String whenCreatedColumn) { - - String baseTableName = table.getName(); - - - addSysPeriodColumns(writer, baseTableName, whenCreatedColumn); - createHistoryTable(writer.applyPostAlter(), table); - createWithHistoryView(writer.applyPostAlter(), baseTableName); - } - protected void addSysPeriodColumns(DdlWrite writer, String baseTableName, String whenCreatedColumn) { platformDdl.alterTableAddColumn(writer, baseTableName, sysPeriodStart, sysPeriodType, now); @@ -172,13 +166,17 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { } protected void createHistoryTableAs(DdlBuffer apply, MTable table) { - apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(table.getName()).append(historySuffix).append("(").newLine(); + apply.append(platformDdl.getCreateTableCommandPrefix()).append(" ").append(historyTableName(table.getName())).append("(").newLine(); for (MColumn column : table.allColumns()) { if (!column.isDraftOnly()) { writeColumnDefinition(apply, column.getName(), column.getType()); apply.append(",").newLine(); } } + // TODO: We must apply also pending dropped columns. Let's do that in a later step + if (table.hasDroppedColumns()) { + throw new IllegalStateException(table.getName() + " has dropped columns. Please generate drop script before enabling history"); + } } protected void createHistoryTableWithPeriod(DdlBuffer apply) { @@ -202,9 +200,9 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { protected void createWithHistoryView(DdlBuffer apply, String baseTableName) { apply - .append("create view ").append(baseTableName).append(viewSuffix) + .append("create view ").append(historyViewName(baseTableName)) .append(" as select * from ").append(baseTableName) - .append(" union all select * from ").append(baseTableName).append(historySuffix) + .append(" union all select * from ").append(historyTableName(baseTableName)) .endOfStatement(); } @@ -214,11 +212,11 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { } protected void dropWithHistoryView(DdlBuffer apply, String baseTableName) { - apply.append("drop view ").append(baseTableName).append(viewSuffix).endOfStatement(); + apply.append("drop view ").append(historyViewName(baseTableName)).endOfStatement(); } protected void dropHistoryTable(DdlBuffer apply, String baseTableName) { - apply.append("drop table ").append(baseTableName).append(historySuffix).endOfStatement().end(); + apply.append("drop table ").append(historyTableName(baseTableName)).endOfStatement().end(); } protected void dropSysPeriodColumns(DdlWrite writer, String baseTableName) { @@ -228,7 +226,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { protected void appendInsertIntoHistory(DdlBuffer buffer, String baseTable, List columns) { - buffer.append(" insert into ").append(baseTable).append(historySuffix).append(" (").append(sysPeriodStart).append(",").append(sysPeriodEnd).append(","); + buffer.append(" insert into ").append(historyTableName(baseTable)).append(" (").append(sysPeriodStart).append(",").append(sysPeriodEnd).append(","); appendColumnNames(buffer, columns, ""); buffer.append(") values (OLD.").append(sysPeriodStart).append(", ").append(sysPeriodEndValue).append(","); appendColumnNames(buffer, columns, "OLD."); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 90fd27228..324246377 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -455,6 +455,13 @@ public class MTable { return columnNames; } + /** + * Returns true, if there are pending dropped columns. + */ + public boolean hasDroppedColumns() { + return !droppedColumns.isEmpty(); + } + /** * Return all the columns (excluding columns marked as dropped). */