diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java index 699f1324d..163323fbb 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java @@ -18,7 +18,9 @@ public class DdlWrite { private final DdlBuffer applyForeignKeys; - private final DdlBuffer applyHistory; + private final DdlBuffer applyHistoryView; + + private final DdlBuffer applyHistoryTrigger; private final DdlBuffer dropAllForeignKeys; @@ -39,7 +41,8 @@ public class DdlWrite { this.applyDropDependencies = new BaseDdlBuffer(configuration); this.apply = new BaseDdlBuffer(configuration); this.applyForeignKeys = new BaseDdlBuffer(configuration); - this.applyHistory = new BaseDdlBuffer(configuration); + this.applyHistoryView = new BaseDdlBuffer(configuration); + this.applyHistoryTrigger = new BaseDdlBuffer(configuration); this.dropAllForeignKeys = new BaseDdlBuffer(configuration); this.dropAll = new BaseDdlBuffer(configuration); } @@ -61,7 +64,8 @@ public class DdlWrite { public boolean isApplyEmpty() { return apply.getBuffer().isEmpty() && applyForeignKeys.getBuffer().isEmpty() - && applyHistory.getBuffer().isEmpty() + && applyHistoryView.getBuffer().isEmpty() + && applyHistoryTrigger.getBuffer().isEmpty() && applyDropDependencies.getBuffer().isEmpty(); } @@ -90,10 +94,17 @@ public class DdlWrite { } /** - * Return the buffer that apply history DDL is written to. + * Return the buffer that apply history-view DDL is written to. */ - public DdlBuffer applyHistory() { - return applyHistory; + public DdlBuffer applyHistoryView() { + return applyHistoryView; + } + + /** + * Return the buffer that apply history-trigger DDL is written to. + */ + public DdlBuffer applyHistoryTrigger() { + return applyHistoryTrigger; } /** diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index f396312f2..1e68124d6 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -42,6 +42,12 @@ import java.util.Map; */ public class BaseTableDdl implements TableDdl { + enum HistorySupport { + NONE, + SQL2011, + TRIGGER_BASED + } + protected final DbConstraintNaming naming; protected final NamingConvention namingConvention; @@ -78,22 +84,23 @@ public class BaseTableDdl implements TableDdl { private boolean strictMode; - private final boolean sql2011History; + private final HistorySupport historySupport; /** * Helper class that is used to execute the migration ddl before and after the migration action. */ private class DdlMigrationHelp { - private List before; - private List after; - private String tableName; - private String columnName; - private String defaultValue; + private final List before; + private final List after; + private final String tableName; + private final String columnName; + private final String defaultValue; + private final boolean withHistory; /** * Constructor for DdlMigrationHelp when adding a NEW column. */ - DdlMigrationHelp(String tableName, Column column) { + DdlMigrationHelp(String tableName, Column column, boolean withHistory) { this.tableName = tableName; this.columnName = column.getName(); this.defaultValue = platformDdl.convertDefaultValue(column.getDefaultValue()); @@ -105,6 +112,7 @@ public class BaseTableDdl implements TableDdl { before = getScriptsForPlatform(column.getBefore(), platformDdl.getPlatform().getName()); after = getScriptsForPlatform(column.getAfter(), platformDdl.getPlatform().getName()); + this.withHistory = withHistory; } /** @@ -119,6 +127,7 @@ public class BaseTableDdl implements TableDdl { boolean alterNotNull = Boolean.TRUE.equals(alter.isNotnull()); // here we add the platform's default update script + withHistory = isTrue(alter.isWithHistory()); if (alter.getBefore().isEmpty() && alterNotNull) { if (defaultValue == null) { handleStrictError(tableName, columnName); @@ -134,6 +143,10 @@ public class BaseTableDdl implements TableDdl { if (!before.isEmpty()) { buffer.end(); } + + if (!before.isEmpty() && withHistory) { + buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine(); + } for (String ddlScript : before) { buffer.append(translate(ddlScript, tableName, columnName, this.defaultValue)); buffer.endOfStatement(); @@ -141,6 +154,9 @@ public class BaseTableDdl implements TableDdl { } void writeAfter(DdlBuffer buffer) throws IOException { + if (!after.isEmpty() && withHistory) { + buffer.append("-- NOTE: table has @History - special migration may be necessary").newLine(); + } // here we run post migration scripts for (String ddlScript : after) { buffer.append(translate(ddlScript, tableName, columnName, defaultValue)); @@ -198,7 +214,11 @@ public class BaseTableDdl implements TableDdl { this.platformDdl.configure(serverConfig); this.strictMode = serverConfig.getMigrationConfig().isStrictMode(); DbHistorySupport hist = platformDdl.getPlatform().getHistorySupport(); - this.sql2011History = hist != null && hist.isStandardsBased(); + if (hist == null) { + this.historySupport = HistorySupport.NONE; + } else { + this.historySupport = hist.isStandardsBased() ? HistorySupport.SQL2011 : HistorySupport.TRIGGER_BASED; + } } /** @@ -700,8 +720,14 @@ public class BaseTableDdl implements TableDdl { */ @Override public void generateEpilog(DdlWrite write) throws IOException { - for (HistoryTableUpdate update : this.regenerateHistoryTriggers.values()) { - platformDdl.regenerateHistoryTriggers(write, update); + if (!regenerateHistoryTriggers.isEmpty()) { + platformDdl.lockTables(write.applyHistoryTrigger(), regenerateHistoryTriggers.keySet()); + + for (HistoryTableUpdate update : this.regenerateHistoryTriggers.values()) { + platformDdl.regenerateHistoryTriggers(write, update); + } + + platformDdl.unlockTables(write.applyHistoryTrigger(), regenerateHistoryTriggers.keySet()); } platformDdl.generateEpilog(write); } @@ -722,15 +748,15 @@ public class BaseTableDdl implements TableDdl { String tableName = addColumn.getTableName(); List columns = addColumn.getColumn(); for (Column column : columns) { - alterTableAddColumn(writer.apply(), tableName, column, false); + alterTableAddColumn(writer.apply(), tableName, column, false, isTrue(addColumn.isWithHistory())); } - if (isTrue(addColumn.isWithHistory()) && !sql2011History) { + if (isTrue(addColumn.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) { // make same changes to the history table String historyTable = historyTable(tableName); for (Column column : columns) { regenerateHistoryTriggers(tableName, HistoryTableUpdate.Change.ADD, column.getName()); - alterTableAddColumn(writer.apply(), historyTable, column, true); + alterTableAddColumn(writer.apply(), historyTable, column, true, true); } } @@ -771,7 +797,8 @@ public class BaseTableDdl implements TableDdl { String tableName = dropColumn.getTableName(); alterTableDropColumn(writer.apply(), tableName, dropColumn.getColumnName()); - if (isTrue(dropColumn.isWithHistory()) && !sql2011History) { + + if (isTrue(dropColumn.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) { // also drop from the history table regenerateHistoryTriggers(tableName, HistoryTableUpdate.Change.DROP, dropColumn.getColumnName()); alterTableDropColumn(writer.apply(), historyTable(tableName), dropColumn.getColumnName()); @@ -872,8 +899,9 @@ public class BaseTableDdl implements TableDdl { if (hasValue(ddl)) { writer.apply().append(ddl).endOfStatement(); - if (isTrue(alter.isWithHistory()) && alter.getType() != null && !sql2011History) { + if (isTrue(alter.isWithHistory()) && alter.getType() != null && historySupport == historySupport.TRIGGER_BASED) { // mysql and sql server column type change allowing nulls in the history table column + regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName()); AlterColumn alterHistoryColumn = new AlterColumn(); alterHistoryColumn.setTableName(historyTable(alter.getTableName())); alterHistoryColumn.setColumnName(alter.getColumnName()); @@ -923,7 +951,8 @@ public class BaseTableDdl implements TableDdl { String ddl = platformDdl.alterColumnType(alter.getTableName(), alter.getColumnName(), alter.getType()); if (hasValue(ddl)) { writer.apply().append(ddl).endOfStatement(); - if (isTrue(alter.isWithHistory()) && !sql2011History) { + if (isTrue(alter.isWithHistory()) && historySupport == HistorySupport.TRIGGER_BASED) { + regenerateHistoryTriggers(alter.getTableName(), HistoryTableUpdate.Change.ALTER, alter.getColumnName()); // apply same type change to matching column in the history table ddl = platformDdl.alterColumnType(historyTable(alter.getTableName()), alter.getColumnName(), alter.getType()); writer.apply().append(ddl).endOfStatement(); @@ -979,8 +1008,8 @@ public class BaseTableDdl implements TableDdl { platformDdl.alterTableDropColumn(buffer, tableName, columnName); } - protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable) throws IOException { - DdlMigrationHelp help = new DdlMigrationHelp(tableName, column); + protected void alterTableAddColumn(DdlBuffer buffer, String tableName, Column column, boolean onHistoryTable, boolean withHistory) throws IOException { + DdlMigrationHelp help = new DdlMigrationHelp(tableName, column, withHistory); if (!onHistoryTable) { help.writeBefore(buffer); } diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index baceee338..5eb3d6978 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -69,7 +69,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { */ protected void updateTriggers(DdlWrite writer, MTable table, HistoryTableUpdate update) throws IOException { - writer.applyHistory().append("-- changes: ").append(update.description()).newLine(); + writer.applyHistoryTrigger().append("-- changes: ").append(update.description()).newLine(); updateHistoryTriggers(createDbTriggerUpdate(writer, table)); } @@ -154,7 +154,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { String baseTableName = table.getName(); - DdlBuffer apply = writer.applyHistory(); + DdlBuffer apply = writer.applyHistoryView(); addSysPeriodColumns(apply, baseTableName, whenCreatedColumn); createHistoryTable(apply, table); @@ -210,19 +210,19 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { .endOfStatement().end(); } - /** - * Create or replace the with_history view with explicit columns. - */ - protected void createWithHistoryView(DbTriggerUpdate update) throws IOException { - DdlBuffer apply = update.historyBuffer(); - apply.append("create or replace view ").append(update.getBaseTable()).append(viewSuffix).append(" as select "); - appendColumnNames(apply, update.getColumns(), ""); - appendSysPeriodColumns(apply, ", "); - apply.append(" from ").append(update.getBaseTable()).append(" union all select "); - appendColumnNames(apply, update.getColumns(), ""); - appendSysPeriodColumns(apply, ", "); - apply.append(" from ").append(update.getHistoryTable()).endOfStatement().end(); + /** + * For postgres/h2/mysql we need to drop and recreate the view. Well, we could add columns to the end of the view + * but otherwise we need to drop and create it. + */ + protected void recreateHistoryView(DbTriggerUpdate update) throws IOException { + + DdlBuffer buffer = update.dropDependencyBuffer(); + // we need to drop the view early/first before any changes to the tables etc + buffer.append("drop view if exists ").append(update.getBaseTable()).append(viewSuffix).endOfStatement(); + + // recreate the view after all ddl modifications - the view requires ALL columns, also the historyExclude ones. + createWithHistoryView(update.historyViewBuffer(), update.getBaseTable()); } protected void appendSysPeriodColumns(DdlBuffer apply, String prefix) throws IOException { diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java index d36de350c..fa90a233e 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerUpdate.java @@ -28,10 +28,18 @@ public class DbTriggerUpdate { /** * Return the appropriate buffer for the current mode. */ - public DdlBuffer historyBuffer() { - return writer.applyHistory(); + public DdlBuffer historyViewBuffer() { + return writer.applyHistoryView(); } + /** + * Return the appropriate buffer for the current mode. + */ + public DdlBuffer historyTriggerBuffer() { + return writer.applyHistoryTrigger(); + } + + /** * Return the appropriate drop dependency buffer for the current mode. */ diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java index 24463d3ee..4240c30d9 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdl.java @@ -27,7 +27,7 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl { protected void createTriggers(DdlWrite writer, MTable table) throws IOException { String baseTableName = table.getName(); - DdlBuffer apply = writer.applyHistory(); + DdlBuffer apply = writer.applyHistoryTrigger(); addCreateTrigger(apply, updateTriggerName(baseTableName), baseTableName); } @@ -35,7 +35,9 @@ public class H2HistoryDdl extends DbTriggerBasedHistoryDdl { @Override protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException { - DdlBuffer buffer = update.historyBuffer(); + recreateHistoryView(update); + + DdlBuffer buffer = update.historyTriggerBuffer(); dropTriggers(buffer, update.getBaseTable()); addCreateTrigger(buffer, updateTriggerName(update.getBaseTable()), update.getBaseTable()); } diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java index b308c85a2..a72350a1f 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HistoryTableUpdate.java @@ -17,7 +17,8 @@ public class HistoryTableUpdate { ADD, DROP, INCLUDE, - EXCLUDE + EXCLUDE, + ALTER } private static class Column { diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java index 8aec85abc..7c2507873 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java @@ -7,6 +7,7 @@ import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.Column; import java.io.IOException; +import java.util.Collection; /** * MySql specific DDL. @@ -113,10 +114,39 @@ public class MySqlDdl extends PlatformDdl { } apply.append(String.format("alter table %s comment = '%s'", tableName, tableComment)).endOfStatement(); } - + @Override public void addColumnComment(DdlBuffer apply, String table, String column, String comment) throws IOException { // alter comment currently not supported as it requires to repeat whole column definition } - + + + /** + * Locks all tables for triggers that have to be updated. + */ + @Override + public void lockTables(DdlBuffer buffer, Collection tables) throws IOException { + if (!tables.isEmpty()) { + buffer.append("lock tables "); + int i = 0; + for (String table : tables) { + if (i > 0) { + buffer.append(", "); + } + buffer.append(table).append(" write"); + i++; + } + buffer.endOfStatement(); + + } + } + + /** + * Unlocks all tables for triggers that have to be updated. + */ + @Override + public void unlockTables(DdlBuffer buffer, Collection tables) throws IOException { + buffer.append("unlock tables").endOfStatement(); + } + } diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java index d41fa23e4..d67e1c08a 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlHistoryDdl.java @@ -34,19 +34,19 @@ public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl { @Override protected void updateHistoryTriggers(DbTriggerUpdate update) throws IOException { - DdlBuffer buffer = update.historyBuffer(); + recreateHistoryView(update); + + DdlBuffer buffer = update.historyTriggerBuffer(); String baseTable = update.getBaseTable(); - buffer.append("lock tables ").append(baseTable).append(" write").endOfStatement(); dropTriggers(buffer, baseTable); addBeforeUpdate(updateTriggerName(baseTable), update); addBeforeDelete(deleteTriggerName(baseTable), update); - buffer.append("unlock tables").endOfStatement(); } private void addBeforeUpdate(String triggerName, DbTriggerUpdate update) throws IOException { - DdlBuffer apply = update.historyBuffer(); + DdlBuffer apply = update.historyTriggerBuffer(); apply .append("delimiter $$").newLine() .append("create trigger ").append(triggerName).append(" before update on ").append(update.getBaseTable()) @@ -59,7 +59,7 @@ public class MySqlHistoryDdl extends DbTriggerBasedHistoryDdl { private void addBeforeDelete(String triggerName, DbTriggerUpdate update) throws IOException { - DdlBuffer apply = update.historyBuffer(); + DdlBuffer apply = update.historyTriggerBuffer(); apply .append("delimiter $$").newLine() .append("create trigger ").append(triggerName).append(" before delete on ").append(update.getBaseTable()) diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java index 35dc8f28c..f0c33c5a4 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -20,10 +20,12 @@ import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.DropHistoryTable; import io.ebeaninternal.dbmigration.migration.IdentityType; import io.ebeaninternal.dbmigration.model.MTable; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.Collection; import java.util.List; /** @@ -442,13 +444,16 @@ public class PlatformDdl { .append(" ").append(addColumn).append(" ").append(column.getName()) .append(" ").append(convertedType); - if (!onHistoryTable) { - if (defaultValue != null) { + // Add default value also to history table if it is not excluded + if (defaultValue != null) { + if (!onHistoryTable || !isTrue(column.isHistoryExclude())) { buffer.append(" default "); buffer.append(defaultValue); } + } + if (!onHistoryTable) { if (isTrue(column.isNotnull())) { buffer.append(" not null"); } @@ -456,7 +461,8 @@ public class PlatformDdl { // check constraints cannot be added in one statement for h2 if (!StringHelper.isNull(column.getCheckConstraint())) { - String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(), column.getCheckConstraint()); + String ddl = alterTableAddCheckConstraint(tableName, column.getCheckConstraintName(), + column.getCheckConstraint()); buffer.append(ddl).endOfStatement(); } } else { @@ -641,4 +647,18 @@ public class PlatformDdl { } return name; } + + /** + * Mysql-specific: Locks all tables for triggers that have to be updated. + */ + public void lockTables(DdlBuffer buffer, Collection tables) throws IOException { + + } + + /** + * Mysql-specific: Unlocks all tables for triggers that have to be updated. + */ + public void unlockTables(DdlBuffer buffer, Collection tables) throws IOException { + + } } diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java index 0abc4a710..fc79ff5ca 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java @@ -62,7 +62,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { String procedureName = procedureName(baseTableName); String triggerName = triggerName(baseTableName); - DdlBuffer apply = writer.applyHistory(); + DdlBuffer apply = writer.applyHistoryTrigger(); apply .append("create trigger ").append(triggerName).newLine() .append(" before update or delete on ").append(baseTableName).newLine() @@ -107,7 +107,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { String historyTable = historyTableName(table.getName()); List columnNames = columnNamesForApply(table); - createOrReplaceFunction(writer.applyHistory(), procedureName, historyTable, columnNames); + createOrReplaceFunction(writer.applyHistoryTrigger(), procedureName, historyTable, columnNames); } @Override @@ -116,21 +116,7 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { String procedureName = procedureName(update.getBaseTable()); recreateHistoryView(update); - createOrReplaceFunction(update.historyBuffer(), procedureName, update.getHistoryTable(), update.getColumns()); - } - - /** - * For postgres we need to drop and recreate the view. Well, we could add columns to the end of the view - * but otherwise we need to drop and create it. - */ - private void recreateHistoryView(DbTriggerUpdate update) throws IOException { - - DdlBuffer buffer = update.dropDependencyBuffer(); - // we need to drop the view early/first before any changes to the tables etc - buffer.append("drop view if exists ").append(update.getBaseTable()).append(viewSuffix).endOfStatement(); - - // recreate the view with specific columns specified (the columns generally are not dropped until later) - createWithHistoryView(update); + createOrReplaceFunction(update.historyTriggerBuffer(), procedureName, update.getHistoryTable(), update.getColumns()); } @Override diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java index 6848b66d8..9f28a88c9 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java @@ -31,19 +31,24 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl { enableSystemVersioning(writer, baseTable); } - private void enableSystemVersioning(DdlWrite writer, String baseTable) throws IOException { - DdlBuffer apply = writer.applyHistory(); - apply.append("alter table ").append(baseTable).newLine() - .append(" add ").append(systemPeriodStart).append(" datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),").newLine() - .append(" ").append(systemPeriodEnd).append(" datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',").newLine() - .append("period for system_time (").append(systemPeriodStart).append(", ").append(systemPeriodEnd).append(")").endOfStatement(); - + private String getHistoryTable(String baseTable) { String historyTable = baseTable + "_history"; // history must contain schema, otherwise you'll get // Setting SYSTEM_VERSIONING to ON failed because history table 'xxx_history' is not specified in two-part name format. if (historyTable.indexOf('.') == -1) { historyTable = "dbo." +historyTable; // so add the default schema, if none was specified. } - apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=").append(historyTable).append("))").endOfStatement(); + return historyTable; + } + + private void enableSystemVersioning(DdlWrite writer, String baseTable) throws IOException { + DdlBuffer apply = writer.applyHistoryView(); + apply.append("alter table ").append(baseTable).newLine() + .append(" add ").append(systemPeriodStart).append(" datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(),").newLine() + .append(" ").append(systemPeriodEnd).append(" datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999',").newLine() + .append("period for system_time (").append(systemPeriodStart).append(", ").append(systemPeriodEnd).append(")").endOfStatement(); + + apply.append("alter table ").append(baseTable).append(" set (system_versioning = on (history_table=") + .append(getHistoryTable(baseTable)).append("))").endOfStatement(); DdlBuffer drop = writer.dropAll(); drop.append("IF OBJECT_ID('").append(baseTable).append("', 'U') IS NOT NULL alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement(); @@ -53,7 +58,7 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl { @Override public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) throws IOException { String baseTable = dropHistoryTable.getBaseTable(); - DdlBuffer apply = writer.applyHistory(); + DdlBuffer apply = writer.applyHistoryView(); apply.append("-- dropping history support for ").append(baseTable).endOfStatement(); // drop default constraints @@ -76,7 +81,15 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl { } @Override - public void updateTriggers(DdlWrite write, HistoryTableUpdate baseTable) throws IOException { + public void updateTriggers(DdlWrite writer, HistoryTableUpdate baseTable) throws IOException { // SQL Server 2016 does not need triggers + DdlBuffer apply = writer.applyHistoryView(); + String baseTableName = baseTable.getBaseTable(); + apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = off (history_table=") + .append(getHistoryTable(baseTableName)).append("))").endOfStatement(); + apply.append("-- history migration goes here").newLine(); + apply.append("-- alter table ").append(baseTableName).append(" set (system_versioning = on (history_table=") + .append(getHistoryTable(baseTableName)).append("))").endOfStatement(); + } } diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java index a90a56fb7..14aba6833 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java @@ -113,7 +113,8 @@ public class CurrentModel { } ddl.append(write.apply().getBuffer()); ddl.append(write.applyForeignKeys().getBuffer()); - ddl.append(write.applyHistory().getBuffer()); + ddl.append(write.applyHistoryView().getBuffer()); + ddl.append(write.applyHistoryTrigger().getBuffer()); return ddl.toString(); } diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java index 1aa3722e5..895613471 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/MColumn.java @@ -527,5 +527,8 @@ public class MColumn { if (hasValue(alterColumn.getForeignKeyOnUpdate())) { fkeyOnUpdate = fkeyMode(alterColumn.getForeignKeyOnUpdate()); } + if (hasValue(alterColumn.isHistoryExclude())) { + historyExclude = alterColumn.isHistoryExclude(); + } } } diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index cf5c64aff..c53e3aad7 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -621,7 +621,7 @@ public class MTable { DropColumn dropColumn = new DropColumn(); dropColumn.setTableName(name); dropColumn.setColumnName(existingColumn.getName()); - if (withHistory && !existingColumn.isHistoryExclude()) { + if (withHistory) { // These dropColumns should occur on the history // table as well as the base table dropColumn.setWithHistory(Boolean.TRUE); diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java index 4529e0975..8b2bd71ab 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/PlatformDdlWriter.java @@ -97,7 +97,8 @@ public class PlatformDdlWriter { writer.append("-- apply changes\n"); writer.append(write.apply().getBuffer()); writer.append(write.applyForeignKeys().getBuffer()); - writer.append(write.applyHistory().getBuffer()); + writer.append(write.applyHistoryView().getBuffer()); + writer.append(write.applyHistoryTrigger().getBuffer()); } private void prependDropDependencies(Writer writer, DdlBuffer buffer) throws IOException { diff --git a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index 569f63311..bf2d10bdd 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -63,6 +63,10 @@ public class DbMigrationTest extends BaseTestCase { "migtest_e_basic", "migtest_e_history", "migtest_e_history2", + "migtest_e_history3", + "migtest_e_history4", + "migtest_e_history5", + "migtest_e_history6", "migtest_e_ref", "migtest_e_softdelete", "migtest_e_user", @@ -98,6 +102,9 @@ public class DbMigrationTest extends BaseTestCase { assertThat(server().execute(update)).isEqualTo(2); } + + createHistoryEntities(); + // Run migration runScript(false, "1.1.sql"); SqlQuery select = server().createSqlQuery("select * from migtest_e_basic order by id"); @@ -154,6 +161,41 @@ public class DbMigrationTest extends BaseTestCase { assertThat(row.keySet()).contains("old_boolean", "old_boolean2"); } + /** + * + */ + private void createHistoryEntities() { + SqlUpdate update = server().createSqlUpdate("insert into migtest_e_history (id, test_string) values (1, '42')"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history set test_string = '45' where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + + update = server().createSqlUpdate("insert into migtest_e_history2 (id, test_string, obsolete_string1, obsolete_string2) values (1, 'foo', 'bar', null)"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history2 set test_string = 'baz' where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + + update = server().createSqlUpdate("insert into migtest_e_history3 (id, test_string) values (1, '42')"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history3 set test_string = '45' where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + + update = server().createSqlUpdate("insert into migtest_e_history4 (id, test_number) values (1, 42)"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history4 set test_number = 45 where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + + update = server().createSqlUpdate("insert into migtest_e_history5 (id, test_number) values (1, 42)"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history5 set test_number = 45 where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + + update = server().createSqlUpdate("insert into migtest_e_history6 (id, test_number2) values (1, 7)"); + assertThat(server().execute(update)).isEqualTo(1); + update = server().createSqlUpdate("update migtest_e_history6 set test_number2 = 45 where id = 1"); + assertThat(server().execute(update)).isEqualTo(1); + } + private void cleanup(String ... tables) { StringBuilder sb = new StringBuilder(); for (String table : tables) { diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java index 961207797..f23dafb49 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java @@ -56,7 +56,7 @@ public class BaseTableDdlTest { column.setName("col_name"); column.setType("varchar(20)"); - ddlGen.alterTableAddColumn(write.apply(), "mytable", column, false); + ddlGen.alterTableAddColumn(write.apply(), "mytable", column, false, false); String ddl = write.apply().getBuffer(); assertThat(ddl).contains("alter table mytable add column col_name varchar2(20)"); diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java index 2eb35187d..ce7e11d59 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java @@ -34,8 +34,15 @@ public class H2HistoryDdlTest { h2Ddl.configure(ebeanServer.getServerConfig()); h2Ddl.regenerateHistoryTriggers(write, update); - assertThat(write.applyHistory().isEmpty()).isFalse(); - assertThat(write.applyHistory().getBuffer()).contains("add one"); + assertThat(write.applyHistoryView().isEmpty()).isFalse(); + assertThat(write.applyHistoryTrigger().isEmpty()).isFalse(); + assertThat(write.applyHistoryView().getBuffer()) + .contains("create view") + .doesNotContain("create trigger"); + assertThat(write.applyHistoryTrigger().getBuffer()) + .contains("add one") + .contains("create trigger") + .doesNotContain("create view"); assertThat(write.dropAll().isEmpty()).isTrue(); } diff --git a/src/test/java/misc/migration/v1_0/EHistory2.java b/src/test/java/misc/migration/v1_0/EHistory2.java index 1cdf859c3..d8c76df75 100644 --- a/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/src/test/java/misc/migration/v1_0/EHistory2.java @@ -6,15 +6,21 @@ import javax.persistence.Id; import javax.persistence.Table; import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; @Entity @Table(name = "migtest_e_history2") @History public class EHistory2 { - + @Id Integer id; - - + + String testString; + + @HistoryExclude + String obsoleteString1; + + String obsoleteString2; } diff --git a/src/test/java/misc/migration/v1_0/EHistory3.java b/src/test/java/misc/migration/v1_0/EHistory3.java new file mode 100644 index 000000000..b5e41db5d --- /dev/null +++ b/src/test/java/misc/migration/v1_0/EHistory3.java @@ -0,0 +1,21 @@ +package misc.migration.v1_0; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history3") +@History +public class EHistory3 { + + @Id + Integer id; + + String testString; + +} diff --git a/src/test/java/misc/migration/v1_0/EHistory4.java b/src/test/java/misc/migration/v1_0/EHistory4.java new file mode 100644 index 000000000..aba167995 --- /dev/null +++ b/src/test/java/misc/migration/v1_0/EHistory4.java @@ -0,0 +1,21 @@ +package misc.migration.v1_0; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history4") +@History +public class EHistory4 { + + @Id + Integer id; + + Integer testNumber; + +} diff --git a/src/test/java/misc/migration/v1_0/EHistory5.java b/src/test/java/misc/migration/v1_0/EHistory5.java new file mode 100644 index 000000000..133a00c3d --- /dev/null +++ b/src/test/java/misc/migration/v1_0/EHistory5.java @@ -0,0 +1,21 @@ +package misc.migration.v1_0; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history5") +@History +public class EHistory5 { + + @Id + Integer id; + + Integer testNumber; + +} diff --git a/src/test/java/misc/migration/v1_0/EHistory6.java b/src/test/java/misc/migration/v1_0/EHistory6.java new file mode 100644 index 000000000..c95eb7796 --- /dev/null +++ b/src/test/java/misc/migration/v1_0/EHistory6.java @@ -0,0 +1,24 @@ +package misc.migration.v1_0; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + + +@Entity +@Table(name = "migtest_e_history6") +@History +public class EHistory6 { + + @Id + Integer id; + + Integer testNumber1; + + @NotNull + Integer testNumber2; +} diff --git a/src/test/java/misc/migration/v1_1/EHistory2.java b/src/test/java/misc/migration/v1_1/EHistory2.java index 1e1fe4ebe..54c2f3d68 100644 --- a/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/src/test/java/misc/migration/v1_1/EHistory2.java @@ -7,6 +7,7 @@ import javax.persistence.Table; import io.ebean.annotation.DbDefault; import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; @Entity @@ -20,7 +21,8 @@ public class EHistory2 { @NotNull @DbDefault("unknown") String testString; - + + @HistoryExclude String testString2; @NotNull diff --git a/src/test/java/misc/migration/v1_1/EHistory3.java b/src/test/java/misc/migration/v1_1/EHistory3.java new file mode 100644 index 000000000..a3756572a --- /dev/null +++ b/src/test/java/misc/migration/v1_1/EHistory3.java @@ -0,0 +1,23 @@ +package misc.migration.v1_1; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; + + +@Entity +@Table(name = "migtest_e_history3") +@History +public class EHistory3 { + + @Id + Integer id; + + @HistoryExclude + String testString; + +} diff --git a/src/test/java/misc/migration/v1_1/EHistory4.java b/src/test/java/misc/migration/v1_1/EHistory4.java new file mode 100644 index 000000000..ba5628390 --- /dev/null +++ b/src/test/java/misc/migration/v1_1/EHistory4.java @@ -0,0 +1,21 @@ +package misc.migration.v1_1; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history4") +@History +public class EHistory4 { + + @Id + Integer id; + + Long testNumber; + +} diff --git a/src/test/java/misc/migration/v1_1/EHistory5.java b/src/test/java/misc/migration/v1_1/EHistory5.java new file mode 100644 index 000000000..9bb9aba0b --- /dev/null +++ b/src/test/java/misc/migration/v1_1/EHistory5.java @@ -0,0 +1,27 @@ +package misc.migration.v1_1; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.DbDefault; +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + + +@Entity +@Table(name = "migtest_e_history5") +@History +public class EHistory5 { + + @Id + Integer id; + + Integer testNumber; + + @NotNull + @DbDefault("false") + Boolean testBoolean; + +} diff --git a/src/test/java/misc/migration/v1_1/EHistory6.java b/src/test/java/misc/migration/v1_1/EHistory6.java new file mode 100644 index 000000000..c05f51a15 --- /dev/null +++ b/src/test/java/misc/migration/v1_1/EHistory6.java @@ -0,0 +1,27 @@ +package misc.migration.v1_1; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.DbDefault; +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + + +@Entity +@Table(name = "migtest_e_history6") +@History +public class EHistory6 { + + @Id + Integer id; + + @NotNull + @DbDefault("42") + Integer testNumber1; + + + Integer testNumber2; +} diff --git a/src/test/java/misc/migration/v1_2/EHistory2.java b/src/test/java/misc/migration/v1_2/EHistory2.java index d5b64ae70..18a2c17fe 100644 --- a/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/src/test/java/misc/migration/v1_2/EHistory2.java @@ -6,15 +6,21 @@ import javax.persistence.Id; import javax.persistence.Table; import io.ebean.annotation.History; +import io.ebean.annotation.HistoryExclude; @Entity @Table(name = "migtest_e_history2") @History public class EHistory2 { - + @Id Integer id; - - + + String testString; + + @HistoryExclude + String obsoleteString1; + + String obsoleteString2; } diff --git a/src/test/java/misc/migration/v1_2/EHistory3.java b/src/test/java/misc/migration/v1_2/EHistory3.java new file mode 100644 index 000000000..f945e6e7b --- /dev/null +++ b/src/test/java/misc/migration/v1_2/EHistory3.java @@ -0,0 +1,21 @@ +package misc.migration.v1_2; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history3") +@History +public class EHistory3 { + + @Id + Integer id; + + String testString; + +} diff --git a/src/test/java/misc/migration/v1_2/EHistory4.java b/src/test/java/misc/migration/v1_2/EHistory4.java new file mode 100644 index 000000000..083928e5c --- /dev/null +++ b/src/test/java/misc/migration/v1_2/EHistory4.java @@ -0,0 +1,21 @@ +package misc.migration.v1_2; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history4") +@History +public class EHistory4 { + + @Id + Integer id; + + Integer testNumber; + +} diff --git a/src/test/java/misc/migration/v1_2/EHistory5.java b/src/test/java/misc/migration/v1_2/EHistory5.java new file mode 100644 index 000000000..9de9206a0 --- /dev/null +++ b/src/test/java/misc/migration/v1_2/EHistory5.java @@ -0,0 +1,21 @@ +package misc.migration.v1_2; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.History; + + +@Entity +@Table(name = "migtest_e_history5") +@History +public class EHistory5 { + + @Id + Integer id; + + Integer testNumber; + +} diff --git a/src/test/java/misc/migration/v1_2/EHistory6.java b/src/test/java/misc/migration/v1_2/EHistory6.java new file mode 100644 index 000000000..1d886ccb2 --- /dev/null +++ b/src/test/java/misc/migration/v1_2/EHistory6.java @@ -0,0 +1,26 @@ +package misc.migration.v1_2; + + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.DbDefault; +import io.ebean.annotation.History; +import io.ebean.annotation.NotNull; + + +@Entity +@Table(name = "migtest_e_history6") +@History +public class EHistory6 { + + @Id + Integer id; + + Integer testNumber1; + + @NotNull + @DbDefault("7") + Integer testNumber2; +} diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql index 2a123be20..386774eb5 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql @@ -85,9 +85,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id integer generated by default as identity not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id integer generated by default as identity not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id integer generated by default as identity not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id integer generated by default as identity not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id integer generated by default as identity not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql index 776e7945f..cf2b1e276 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.1.sql @@ -65,14 +65,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history alter column test_string bigint; comment on table migtest_e_history is 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter column test_string set default 'unknown'; alter table migtest_e_history2 alter column test_string set not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; -alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history4 alter column test_number bigint; +alter table migtest_e_history5 add column test_boolean boolean default false not null; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter column test_number1 set default 42; +alter table migtest_e_history6 alter column test_number1 set not null; +alter table migtest_e_history6 alter column test_number2 set null; alter table migtest_e_softdelete add column deleted boolean default false not null; alter table migtest_oto_child add column master_id bigint; diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql index 602c2d381..f7ff8b135 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql @@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; + drop table migtest_e_ref; drop sequence migtest_e_ref_seq; diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql index a9e2d7622..4b08010eb 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.3.sql @@ -40,6 +40,17 @@ comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 alter column test_string drop default; alter table migtest_e_history2 alter column test_string set null; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 alter column test_number integer; +alter table migtest_e_history6 alter column test_number1 drop default; +alter table migtest_e_history6 alter column test_number1 set null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter column test_number2 set default 7; +alter table migtest_e_history6 alter column test_number2 set not null; create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1); create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5); drop index ix_mgtst__b_eu8css; diff --git a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql index 0ae87600a..cf681d5d1 100644 --- a/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql @@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress; alter table migtest_e_basic drop column new_integer; alter table migtest_e_history2 drop column test_string2; -alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; -alter table migtest_e_history2_history drop column test_string3; + +alter table migtest_e_history5 drop column test_boolean; alter table migtest_e_softdelete drop column deleted; diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql index 9d4204f43..38edf4d47 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql @@ -85,9 +85,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id integer auto_increment not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id integer auto_increment not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id integer auto_increment not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id integer auto_increment not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id integer auto_increment not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -141,9 +168,56 @@ alter table migtest_e_history2 add column sys_period_end datetime(6); create table migtest_e_history2_history( id integer, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), sys_period_start datetime(6), sys_period_end datetime(6) ); create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; +alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history3 add column sys_period_end datetime(6); +create table migtest_e_history3_history( + id integer, + test_string varchar(255), + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history4 add column sys_period_end datetime(6); +create table migtest_e_history4_history( + id integer, + test_number integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history5 add column sys_period_end datetime(6); +create table migtest_e_history5_history( + id integer, + test_number integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + +alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history6 add column sys_period_end datetime(6); +create table migtest_e_history6_history( + id integer, + test_number1 integer, + test_number2 integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history; + create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +create trigger migtest_e_history6_history_upd before update,delete on migtest_e_history6 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql index 9f633b46c..d6f916d89 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.1.sql @@ -1,4 +1,10 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; +drop view if exists migtest_e_history5_with_history; + -- apply changes create table migtest_e_user ( id integer auto_increment not null, @@ -65,14 +71,26 @@ comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history alter column test_string bigint; comment on table migtest_e_history is 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter column test_string set default 'unknown'; alter table migtest_e_history2 alter column test_string set not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown'; +alter table migtest_e_history4 alter column test_number bigint; +alter table migtest_e_history4_history alter column test_number bigint; +alter table migtest_e_history5 add column test_boolean boolean default false not null; +alter table migtest_e_history5_history add column test_boolean boolean default false; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter column test_number1 set default 42; +alter table migtest_e_history6 alter column test_number1 set not null; +alter table migtest_e_history6 alter column test_number2 set null; alter table migtest_e_softdelete add column deleted boolean default false not null; alter table migtest_oto_child add column master_id bigint; @@ -108,7 +126,24 @@ create table migtest_e_history_history( ); create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + create trigger migtest_e_history_history_upd before update,delete on migtest_e_history for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; -- changes: [add test_string2, add test_string3] drop trigger migtest_e_history2_history_upd; create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [exclude test_string] +drop trigger migtest_e_history3_history_upd; +create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [alter test_number] +drop trigger migtest_e_history4_history_upd; +create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [add test_boolean] +drop trigger migtest_e_history5_history_upd; +create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql index 057cfb3f3..dea5dde03 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql @@ -1,4 +1,7 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; + -- apply changes alter table migtest_e_basic drop column old_boolean; @@ -6,5 +9,16 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; +alter table migtest_e_history2_history drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; +alter table migtest_e_history2_history drop column obsolete_string2; + drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +-- changes: [drop obsolete_string1, drop obsolete_string2] +drop trigger migtest_e_history2_history_upd; +create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql index 4fc5732b4..e8a90cb8f 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.3.sql @@ -1,4 +1,9 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; + -- apply changes create table migtest_e_ref ( id integer auto_increment not null, @@ -40,6 +45,20 @@ comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 alter column test_string drop default; alter table migtest_e_history2 alter column test_string set null; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); +alter table migtest_e_history2_history add column obsolete_string1 varchar(255); +alter table migtest_e_history2_history add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 alter column test_number integer; +alter table migtest_e_history4_history alter column test_number integer; +alter table migtest_e_history6 alter column test_number1 drop default; +alter table migtest_e_history6 alter column test_number1 set null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter column test_number2 set default 7; +alter table migtest_e_history6 alter column test_number2 set not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index if exists ix_migtest_e_basic_indextest3; @@ -47,3 +66,18 @@ drop index if exists ix_migtest_e_basic_indextest6; create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +-- changes: [add obsolete_string1, add obsolete_string2] +drop trigger migtest_e_history2_history_upd; +create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [include test_string] +drop trigger migtest_e_history3_history_upd; +create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [alter test_number] +drop trigger migtest_e_history4_history_upd; +create trigger migtest_e_history4_history_upd before update,delete on migtest_e_history4 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql index a644d1461..fd0fb772f 100644 --- a/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql @@ -6,6 +6,8 @@ alter table migtest_e_history drop column sys_period_start; alter table migtest_e_history drop column sys_period_end; drop table migtest_e_history_history; +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history5_with_history; -- apply changes alter table migtest_ckey_detail drop column one_key; @@ -30,6 +32,9 @@ alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; alter table migtest_e_history2_history drop column test_string3; +alter table migtest_e_history5 drop column test_boolean; +alter table migtest_e_history5_history drop column test_boolean; + alter table migtest_e_softdelete drop column deleted; alter table migtest_oto_child drop column master_id; @@ -38,6 +43,13 @@ drop table if exists migtest_e_user; drop sequence if exists migtest_e_user_seq; drop table if exists migtest_mtm_c_migtest_mtm_m; drop table if exists migtest_mtm_m_migtest_mtm_c; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + -- changes: [drop test_string2, drop test_string3] drop trigger migtest_e_history2_history_upd; create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +-- changes: [drop test_boolean] +drop trigger migtest_e_history5_history_upd; +create trigger migtest_e_history5_history_upd before update,delete on migtest_e_history5 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql index 6e8b39c42..a8af75d02 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql @@ -85,9 +85,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id integer generated by default as identity (start with 1) not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id integer generated by default as identity (start with 1) not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id integer generated by default as identity (start with 1) not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id integer generated by default as identity (start with 1) not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id integer generated by default as identity (start with 1) not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity (start with 1) not null, name varchar(127) not null, diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql index ec6506025..b1e21443c 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql @@ -65,14 +65,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history alter column test_string bigint; comment on table migtest_e_history is 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter column test_string set default 'unknown'; alter table migtest_e_history2 alter column test_string set not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; -alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history4 alter column test_number bigint; +alter table migtest_e_history5 add column test_boolean boolean default false not null; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter column test_number1 set default 42; +alter table migtest_e_history6 alter column test_number1 set not null; +alter table migtest_e_history6 alter column test_number2 set null; alter table migtest_e_softdelete add column deleted boolean default false not null; alter table migtest_oto_child add column master_id bigint; diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql index 057cfb3f3..6fb11c3a4 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql @@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; + drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql index bff47b901..9ec91f4f2 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql @@ -40,6 +40,17 @@ comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 alter column test_string drop default; alter table migtest_e_history2 alter column test_string set null; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 alter column test_number integer; +alter table migtest_e_history6 alter column test_number1 drop default; +alter table migtest_e_history6 alter column test_number1 set null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter column test_number2 set default 7; +alter table migtest_e_history6 alter column test_number2 set not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index if exists ix_migtest_e_basic_indextest3; diff --git a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql index 95542680e..413f33e82 100644 --- a/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql @@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress; alter table migtest_e_basic drop column new_integer; alter table migtest_e_history2 drop column test_string2; -alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; -alter table migtest_e_history2_history drop column test_string3; + +alter table migtest_e_history5 drop column test_boolean; alter table migtest_e_softdelete drop column deleted; diff --git a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml index 1e951234e..386d4410c 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml @@ -64,6 +64,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml index d1c893673..86eff4a3a 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml @@ -44,9 +44,16 @@ - + + + + + + + + @@ -77,6 +84,8 @@ + + \ No newline at end of file diff --git a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml index aff7eb878..e60796068 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml @@ -5,6 +5,8 @@ + + \ No newline at end of file diff --git a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml index f9b23929f..89fbcd07a 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml @@ -25,6 +25,14 @@ + + + + + + + + @@ -47,6 +55,7 @@ + diff --git a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml index 6d17f89f2..506444d0b 100644 --- a/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml +++ b/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml @@ -13,6 +13,7 @@ + diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql index 8e1c0557f..ae4936281 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql @@ -85,9 +85,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id integer auto_increment not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id integer auto_increment not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id integer auto_increment not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id integer auto_increment not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id integer auto_increment not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -141,17 +168,96 @@ alter table migtest_e_history2 add column sys_period_end datetime(6); create table migtest_e_history2_history( id integer, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), sys_period_start datetime(6), sys_period_end datetime(6) ); create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; +alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history3 add column sys_period_end datetime(6); +create table migtest_e_history3_history( + id integer, + test_string varchar(255), + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history4 add column sys_period_end datetime(6); +create table migtest_e_history4_history( + id integer, + test_number integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history5 add column sys_period_end datetime(6); +create table migtest_e_history5_history( + id integer, + test_number integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + +alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6); +alter table migtest_e_history6 add column sys_period_end datetime(6); +create table migtest_e_history6_history( + id integer, + test_number1 integer, + test_number2 integer, + sys_period_start datetime(6), + sys_period_end datetime(6) +); +create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history; + delimiter $$ create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2); set NEW.sys_period_start = now(6); end$$ delimiter $$ create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2); +end$$ +delimiter $$ +create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); +end$$ +delimiter $$ +create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); +end$$ +delimiter $$ +create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); +end$$ +delimiter $$ +create trigger migtest_e_history6_history_upd before update on migtest_e_history6 for each row begin + insert into migtest_e_history6_history (sys_period_start,sys_period_end,id, test_number1, test_number2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number1, OLD.test_number2); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history6_history_del before delete on migtest_e_history6 for each row begin + insert into migtest_e_history6_history (sys_period_start,sys_period_end,id, test_number1, test_number2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number1, OLD.test_number2); end$$ diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql index b7de26f72..738778578 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql @@ -1,4 +1,10 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; +drop view if exists migtest_e_history5_with_history; + -- apply changes create table migtest_e_user ( id integer auto_increment not null, @@ -63,14 +69,26 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique alter table migtest_e_history modify test_string bigint; alter table migtest_e_history comment = 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter test_string set default 'unknown'; alter table migtest_e_history2 modify test_string varchar(255) not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown'; +alter table migtest_e_history4 modify test_number bigint; +alter table migtest_e_history4_history modify test_number bigint; +alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null; +alter table migtest_e_history5_history add column test_boolean tinyint(1) default 0; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter test_number1 set default 42; +alter table migtest_e_history6 modify test_number1 integer not null; +alter table migtest_e_history6 modify test_number2 integer; alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null; alter table migtest_oto_child add column master_id bigint; @@ -106,6 +124,14 @@ create table migtest_e_history_history( ); create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + delimiter $$ create trigger migtest_e_history_history_upd before update on migtest_e_history for each row begin insert into migtest_e_history_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); @@ -115,17 +141,53 @@ delimiter $$ create trigger migtest_e_history_history_del before delete on migtest_e_history for each row begin insert into migtest_e_history_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); end$$ +lock tables migtest_e_history2 write, migtest_e_history3 write, migtest_e_history4 write, migtest_e_history5 write; -- changes: [add test_string2, add test_string3] -lock tables migtest_e_history2 write; drop trigger migtest_e_history2_history_upd; drop trigger migtest_e_history2_history_del; delimiter $$ create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2); set NEW.sys_period_start = now(6); end$$ delimiter $$ create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2); +end$$ +-- changes: [exclude test_string] +drop trigger migtest_e_history3_history_upd; +drop trigger migtest_e_history3_history_del; +delimiter $$ +create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id) values (OLD.sys_period_start, now(6),OLD.id); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id) values (OLD.sys_period_start, now(6),OLD.id); +end$$ +-- changes: [alter test_number] +drop trigger migtest_e_history4_history_upd; +drop trigger migtest_e_history4_history_del; +delimiter $$ +create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); +end$$ +-- changes: [add test_boolean] +drop trigger migtest_e_history5_history_upd; +drop trigger migtest_e_history5_history_del; +delimiter $$ +create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number, test_boolean) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number, OLD.test_boolean); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number, test_boolean) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number, OLD.test_boolean); end$$ unlock tables; diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql index 0c6ddbf56..cab80c68a 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql @@ -1,4 +1,7 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; + -- apply changes alter table migtest_e_basic drop column old_boolean; @@ -6,4 +9,26 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; +alter table migtest_e_history2_history drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; +alter table migtest_e_history2_history drop column obsolete_string2; + drop table if exists migtest_e_ref; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +lock tables migtest_e_history2 write; +-- changes: [drop obsolete_string1, drop obsolete_string2] +drop trigger migtest_e_history2_history_upd; +drop trigger migtest_e_history2_history_del; +delimiter $$ +create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3); +end$$ +unlock tables; diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql index 4fb4d19f5..e0a81437d 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql @@ -1,4 +1,9 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; + -- apply changes create table migtest_e_ref ( id integer auto_increment not null, @@ -35,6 +40,19 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique (indextest6); alter table migtest_e_history comment = ''; alter table migtest_e_history2 alter test_string drop default; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); +alter table migtest_e_history2_history add column obsolete_string1 varchar(255); +alter table migtest_e_history2_history add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 modify test_number integer; +alter table migtest_e_history4_history modify test_number integer; +alter table migtest_e_history6 alter test_number1 drop default; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter test_number2 set default 7; +alter table migtest_e_history6 modify test_number2 integer not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index ix_migtest_e_basic_indextest3 on migtest_e_basic; @@ -42,3 +60,47 @@ drop index ix_migtest_e_basic_indextest6 on migtest_e_basic; create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +lock tables migtest_e_history2 write, migtest_e_history3 write, migtest_e_history4 write; +-- changes: [add obsolete_string1, add obsolete_string2] +drop trigger migtest_e_history2_history_upd; +drop trigger migtest_e_history2_history_del; +delimiter $$ +create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2, test_string2, test_string3) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3); +end$$ +-- changes: [include test_string] +drop trigger migtest_e_history3_history_upd; +drop trigger migtest_e_history3_history_del; +delimiter $$ +create trigger migtest_e_history3_history_upd before update on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history3_history_del before delete on migtest_e_history3 for each row begin + insert into migtest_e_history3_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); +end$$ +-- changes: [alter test_number] +drop trigger migtest_e_history4_history_upd; +drop trigger migtest_e_history4_history_del; +delimiter $$ +create trigger migtest_e_history4_history_upd before update on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history4_history_del before delete on migtest_e_history4 for each row begin + insert into migtest_e_history4_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); +end$$ +unlock tables; diff --git a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql index 93f1fecae..548aec6b8 100644 --- a/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql @@ -7,6 +7,8 @@ alter table migtest_e_history drop column sys_period_start; alter table migtest_e_history drop column sys_period_end; drop table migtest_e_history_history; +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history5_with_history; -- apply changes alter table migtest_ckey_detail drop column one_key; @@ -31,6 +33,9 @@ alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; alter table migtest_e_history2_history drop column test_string3; +alter table migtest_e_history5 drop column test_boolean; +alter table migtest_e_history5_history drop column test_boolean; + alter table migtest_e_softdelete drop column deleted; alter table migtest_oto_child drop column master_id; @@ -38,17 +43,33 @@ alter table migtest_oto_child drop column master_id; drop table if exists migtest_e_user; drop table if exists migtest_mtm_c_migtest_mtm_m; drop table if exists migtest_mtm_m_migtest_mtm_c; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + +lock tables migtest_e_history2 write, migtest_e_history5 write; -- changes: [drop test_string2, drop test_string3] -lock tables migtest_e_history2 write; drop trigger migtest_e_history2_history_upd; drop trigger migtest_e_history2_history_del; delimiter $$ create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2); set NEW.sys_period_start = now(6); end$$ delimiter $$ create trigger migtest_e_history2_history_del before delete on migtest_e_history2 for each row begin - insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, obsolete_string2) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.obsolete_string2); +end$$ +-- changes: [drop test_boolean] +drop trigger migtest_e_history5_history_upd; +drop trigger migtest_e_history5_history_del; +delimiter $$ +create trigger migtest_e_history5_history_upd before update on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); + set NEW.sys_period_start = now(6); +end$$ +delimiter $$ +create trigger migtest_e_history5_history_del before delete on migtest_e_history5 for each row begin + insert into migtest_e_history5_history (sys_period_start,sys_period_end,id, test_number) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_number); end$$ unlock tables; diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql index fb1f1e66e..0a2bbb648 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql @@ -95,10 +95,41 @@ create sequence migtest_e_history_seq; create table migtest_e_history2 ( id number(10) not null, test_string varchar2(255), + obsolete_string1 varchar2(255), + obsolete_string2 varchar2(255), constraint pk_migtest_e_history2 primary key (id) ); create sequence migtest_e_history2_seq; +create table migtest_e_history3 ( + id number(10) not null, + test_string varchar2(255), + constraint pk_migtest_e_history3 primary key (id) +); +create sequence migtest_e_history3_seq; + +create table migtest_e_history4 ( + id number(10) not null, + test_number number(10), + constraint pk_migtest_e_history4 primary key (id) +); +create sequence migtest_e_history4_seq; + +create table migtest_e_history5 ( + id number(10) not null, + test_number number(10), + constraint pk_migtest_e_history5 primary key (id) +); +create sequence migtest_e_history5_seq; + +create table migtest_e_history6 ( + id number(10) not null, + test_number1 number(10), + test_number2 number(10) not null, + constraint pk_migtest_e_history6 primary key (id) +); +create sequence migtest_e_history6_seq; + create table migtest_e_ref ( id number(10) not null, name varchar2(127) not null, diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql index 8aea49e91..63adc8dbf 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql @@ -66,12 +66,22 @@ comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history modify test_string number(19); comment on table migtest_e_history is 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 modify test_string default 'unknown'; alter table migtest_e_history2 modify test_string not null; alter table migtest_e_history2 add column test_string2 varchar2(255); alter table migtest_e_history2 add column test_string3 varchar2(255) default 'unknown' not null; +alter table migtest_e_history4 modify test_number number(19); +alter table migtest_e_history5 add column test_boolean number(1) default 0 not null; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 modify test_number1 default 42; +alter table migtest_e_history6 modify test_number1 not null; +alter table migtest_e_history6 modify test_number2 null; alter table migtest_e_softdelete add column deleted number(1) default 0 not null; alter table migtest_oto_child add column master_id number(19); diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql index 9851e7f65..4f2337db3 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql @@ -6,5 +6,9 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; + drop table migtest_e_ref cascade constraints purge; drop sequence migtest_e_ref_seq; diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql index 57fbfe9b7..4ba0b1242 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql @@ -41,6 +41,17 @@ comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 modify test_string drop default; alter table migtest_e_history2 modify test_string null; +alter table migtest_e_history2 add column obsolete_string1 varchar2(255); +alter table migtest_e_history2 add column obsolete_string2 varchar2(255); + +alter table migtest_e_history4 modify test_number number(10); +alter table migtest_e_history6 modify test_number1 drop default; +alter table migtest_e_history6 modify test_number1 null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 modify test_number2 default 7; +alter table migtest_e_history6 modify test_number2 not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index ix_migtest_e_basic_indextest3; diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql index cf48c760e..b370f746a 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql @@ -20,6 +20,8 @@ alter table migtest_e_history2 drop column test_string2; alter table migtest_e_history2 drop column test_string3; +alter table migtest_e_history5 drop column test_boolean; + alter table migtest_e_softdelete drop column deleted; alter table migtest_oto_child drop column master_id; diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql index b15609fdd..0ad03898d 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql @@ -85,9 +85,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id serial not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id serial not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id serial not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id serial not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id serial not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id serial not null, name varchar(127) not null, @@ -140,14 +167,30 @@ alter table migtest_e_history2 add column sys_period tstzrange not null default create table migtest_e_history2_history(like migtest_e_history2); create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; +alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null); +create table migtest_e_history3_history(like migtest_e_history3); +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null); +create table migtest_e_history4_history(like migtest_e_history4); +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null); +create table migtest_e_history5_history(like migtest_e_history5); +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + +alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null); +create table migtest_e_history6_history(like migtest_e_history6); +create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history; + create or replace function migtest_e_history2_history_version() returns trigger as $$ begin if (TG_OP = 'UPDATE') then - insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2); NEW.sys_period = tstzrange(current_timestamp,null); return new; elsif (TG_OP = 'DELETE') then - insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2); return old; end if; end; @@ -157,3 +200,71 @@ create trigger migtest_e_history2_history_upd before update or delete on migtest_e_history2 for each row execute procedure migtest_e_history2_history_version(); +create or replace function migtest_e_history3_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +create trigger migtest_e_history3_history_upd + before update or delete on migtest_e_history3 + for each row execute procedure migtest_e_history3_history_version(); + +create or replace function migtest_e_history4_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +create trigger migtest_e_history4_history_upd + before update or delete on migtest_e_history4 + for each row execute procedure migtest_e_history4_history_version(); + +create or replace function migtest_e_history5_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +create trigger migtest_e_history5_history_upd + before update or delete on migtest_e_history5 + for each row execute procedure migtest_e_history5_history_version(); + +create or replace function migtest_e_history6_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history6_history (sys_period,id, test_number1, test_number2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number1, OLD.test_number2); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +create trigger migtest_e_history6_history_upd + before update or delete on migtest_e_history6 + for each row execute procedure migtest_e_history6_history_version(); + diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql index 3b4d3e3b2..40c16d978 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql @@ -1,6 +1,9 @@ -- Migrationscripts for ebean unittest -- drop dependencies drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; +drop view if exists migtest_e_history5_with_history; -- apply changes create table migtest_e_user ( @@ -70,14 +73,26 @@ comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history alter column test_string type bigint; comment on table migtest_e_history is 'We have history now'; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter column test_string set default 'unknown'; alter table migtest_e_history2 alter column test_string set not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown'; +alter table migtest_e_history4 alter column test_number type bigint; +alter table migtest_e_history4_history alter column test_number type bigint; +alter table migtest_e_history5 add column test_boolean boolean default false not null; +alter table migtest_e_history5_history add column test_boolean boolean default false; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter column test_number1 set default 42; +alter table migtest_e_history6 alter column test_number1 set not null; +alter table migtest_e_history6 alter column test_number2 drop not null; alter table migtest_e_softdelete add column deleted boolean default false not null; alter table migtest_oto_child add column master_id bigint; @@ -107,6 +122,14 @@ alter table migtest_e_history add column sys_period tstzrange not null default t create table migtest_e_history_history(like migtest_e_history); create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + create or replace function migtest_e_history_history_version() returns trigger as $$ begin if (TG_OP = 'UPDATE') then @@ -125,16 +148,56 @@ create trigger migtest_e_history_history_upd for each row execute procedure migtest_e_history_history_version(); -- changes: [add test_string2, add test_string3] -create or replace view migtest_e_history2_with_history as select id, test_string, test_string2, test_string3, sys_period from migtest_e_history2 union all select id, test_string, test_string2, test_string3, sys_period from migtest_e_history2_history; - create or replace function migtest_e_history2_history_version() returns trigger as $$ begin if (TG_OP = 'UPDATE') then - insert into migtest_e_history2_history (sys_period,id, test_string, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3); + insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2); NEW.sys_period = tstzrange(current_timestamp,null); return new; elsif (TG_OP = 'DELETE') then - insert into migtest_e_history2_history (sys_period,id, test_string, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string2, OLD.test_string3); + insert into migtest_e_history2_history (sys_period,id, test_string, test_string3, obsolete_string1, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3, OLD.obsolete_string1, OLD.obsolete_string2); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [exclude test_string] +create or replace function migtest_e_history3_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history3_history (sys_period,id) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [alter test_number] +create or replace function migtest_e_history4_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [add test_boolean] +create or replace function migtest_e_history5_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history5_history (sys_period,id, test_number, test_boolean) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number, OLD.test_boolean); return old; end if; end; diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql index 7917b78da..67f252e11 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql @@ -1,4 +1,7 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; + -- apply changes alter table migtest_e_basic drop column old_boolean; @@ -6,5 +9,27 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; +alter table migtest_e_history2_history drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; +alter table migtest_e_history2_history drop column obsolete_string2; + drop table if exists migtest_e_ref cascade; drop sequence if exists migtest_e_ref_seq; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +-- changes: [drop obsolete_string1, drop obsolete_string2] +create or replace function migtest_e_history2_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history2_history (sys_period,id, test_string, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.test_string3); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql index 3353df6fa..89e93220f 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql @@ -1,4 +1,9 @@ -- Migrationscripts for ebean unittest +-- drop dependencies +drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history3_with_history; +drop view if exists migtest_e_history4_with_history; + -- apply changes create table migtest_e_ref ( id serial not null, @@ -40,6 +45,20 @@ comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 alter column test_string drop default; alter table migtest_e_history2 alter column test_string drop not null; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); +alter table migtest_e_history2_history add column obsolete_string1 varchar(255); +alter table migtest_e_history2_history add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 alter column test_number type integer; +alter table migtest_e_history4_history alter column test_number type integer; +alter table migtest_e_history6 alter column test_number1 drop default; +alter table migtest_e_history6 alter column test_number1 drop not null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter column test_number2 set default 7; +alter table migtest_e_history6 alter column test_number2 set not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index if exists ix_migtest_e_basic_indextest3; @@ -47,3 +66,51 @@ drop index if exists ix_migtest_e_basic_indextest6; create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; + +create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history; + +create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history; + +-- changes: [add obsolete_string1, add obsolete_string2] +create or replace function migtest_e_history2_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2, test_string2, test_string3) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2, OLD.test_string2, OLD.test_string3); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [include test_string] +create or replace function migtest_e_history3_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history3_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [alter test_number] +create or replace function migtest_e_history4_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history4_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + diff --git a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql index e877b64da..af25ac556 100644 --- a/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql @@ -8,6 +8,7 @@ alter table migtest_e_history drop column sys_period; drop table migtest_e_history_history; drop view if exists migtest_e_history2_with_history; +drop view if exists migtest_e_history5_with_history; -- apply changes alter table migtest_ckey_detail drop column one_key; @@ -32,6 +33,9 @@ alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; alter table migtest_e_history2_history drop column test_string3; +alter table migtest_e_history5 drop column test_boolean; +alter table migtest_e_history5_history drop column test_boolean; + alter table migtest_e_softdelete drop column deleted; alter table migtest_oto_child drop column master_id; @@ -40,17 +44,33 @@ drop table if exists migtest_e_user cascade; drop sequence if exists migtest_e_user_seq; drop table if exists migtest_mtm_c_migtest_mtm_m cascade; drop table if exists migtest_mtm_m_migtest_mtm_c cascade; --- changes: [drop test_string2, drop test_string3] -create or replace view migtest_e_history2_with_history as select id, test_string, sys_period from migtest_e_history2 union all select id, test_string, sys_period from migtest_e_history2_history; +create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; +create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history; + +-- changes: [drop test_string2, drop test_string3] create or replace function migtest_e_history2_history_version() returns trigger as $$ begin if (TG_OP = 'UPDATE') then - insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2); NEW.sys_period = tstzrange(current_timestamp,null); return new; elsif (TG_OP = 'DELETE') then - insert into migtest_e_history2_history (sys_period,id, test_string) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string); + insert into migtest_e_history2_history (sys_period,id, test_string, obsolete_string2) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_string, OLD.obsolete_string2); + return old; + end if; +end; +$$ LANGUAGE plpgsql; + +-- changes: [drop test_boolean] +create or replace function migtest_e_history5_history_version() returns trigger as $$ +begin + if (TG_OP = 'UPDATE') then + insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); + NEW.sys_period = tstzrange(current_timestamp,null); + return new; + elsif (TG_OP = 'DELETE') then + insert into migtest_e_history5_history (sys_period,id, test_number) values (tstzrange(lower(OLD.sys_period), current_timestamp), OLD.id, OLD.test_number); return old; end if; end; diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql index 5720ef6ab..40b1d0dcc 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql @@ -88,9 +88,36 @@ create table migtest_e_history ( create table migtest_e_history2 ( id integer not null, test_string varchar(255), + obsolete_string1 varchar(255), + obsolete_string2 varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create table migtest_e_history3 ( + id integer not null, + test_string varchar(255), + constraint pk_migtest_e_history3 primary key (id) +); + +create table migtest_e_history4 ( + id integer not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); + +create table migtest_e_history5 ( + id integer not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); + +create table migtest_e_history6 ( + id integer not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); + create table migtest_e_ref ( id integer not null, name varchar(127) not null, diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql index d5e7c150e..950e740da 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql @@ -61,14 +61,22 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique (indextest5); alter table migtest_e_history alter column test_string integer; +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 alter column test_string set default 'unknown'; alter table migtest_e_history2 alter column test_string set not null; alter table migtest_e_history2 add column test_string2 varchar(255); alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null; -alter table migtest_e_history2_history add column test_string2 varchar(255); -alter table migtest_e_history2_history add column test_string3 varchar(255); +alter table migtest_e_history4 alter column test_number integer; +alter table migtest_e_history5 add column test_boolean int default 0 not null; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 alter column test_number1 set default 42; +alter table migtest_e_history6 alter column test_number1 set not null; +alter table migtest_e_history6 alter column test_number2 set null; alter table migtest_e_softdelete add column deleted int default 0 not null; alter table migtest_oto_child add column master_id integer; diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql index 0c6ddbf56..3f8f468ba 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql @@ -6,4 +6,8 @@ alter table migtest_e_basic drop column old_boolean2; alter table migtest_e_basic drop column eref_id; +alter table migtest_e_history2 drop column obsolete_string1; + +alter table migtest_e_history2 drop column obsolete_string2; + drop table if exists migtest_e_ref; diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql index f06daf11d..77d4552b6 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql @@ -36,6 +36,17 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique (indextest6); alter table migtest_e_history2 alter column test_string drop default; alter table migtest_e_history2 alter column test_string set null; +alter table migtest_e_history2 add column obsolete_string1 varchar(255); +alter table migtest_e_history2 add column obsolete_string2 varchar(255); + +alter table migtest_e_history4 alter column test_number integer; +alter table migtest_e_history6 alter column test_number1 drop default; +alter table migtest_e_history6 alter column test_number1 set null; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 alter column test_number2 set default 7; +alter table migtest_e_history6 alter column test_number2 set not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); drop index if exists ix_migtest_e_basic_indextest3; diff --git a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql index 0d3d24380..cb6dfa7c1 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql @@ -17,10 +17,10 @@ alter table migtest_e_basic drop column progress; alter table migtest_e_basic drop column new_integer; alter table migtest_e_history2 drop column test_string2; -alter table migtest_e_history2_history drop column test_string2; alter table migtest_e_history2 drop column test_string3; -alter table migtest_e_history2_history drop column test_string3; + +alter table migtest_e_history5 drop column test_boolean; alter table migtest_e_softdelete drop column deleted; diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql index ea820be14..3c6ebff79 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql @@ -95,10 +95,41 @@ create sequence migtest_e_history_seq as bigint start with 1 ; create table migtest_e_history2 ( id integer not null, test_string nvarchar(255), + obsolete_string1 nvarchar(255), + obsolete_string2 nvarchar(255), constraint pk_migtest_e_history2 primary key (id) ); create sequence migtest_e_history2_seq as bigint start with 1 ; +create table migtest_e_history3 ( + id integer not null, + test_string nvarchar(255), + constraint pk_migtest_e_history3 primary key (id) +); +create sequence migtest_e_history3_seq as bigint start with 1 ; + +create table migtest_e_history4 ( + id integer not null, + test_number integer, + constraint pk_migtest_e_history4 primary key (id) +); +create sequence migtest_e_history4_seq as bigint start with 1 ; + +create table migtest_e_history5 ( + id integer not null, + test_number integer, + constraint pk_migtest_e_history5 primary key (id) +); +create sequence migtest_e_history5_seq as bigint start with 1 ; + +create table migtest_e_history6 ( + id integer not null, + test_number1 integer, + test_number2 integer not null, + constraint pk_migtest_e_history6 primary key (id) +); +create sequence migtest_e_history6_seq as bigint start with 1 ; + create table migtest_e_ref ( id integer not null, name nvarchar(127) not null, @@ -158,3 +189,23 @@ alter table migtest_e_history2 sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', period for system_time (sys_periodFrom, sys_periodTo); alter table migtest_e_history2 set (system_versioning = on (history_table=dbo.migtest_e_history2_history)); +alter table migtest_e_history3 + add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(), + sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', +period for system_time (sys_periodFrom, sys_periodTo); +alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history)); +alter table migtest_e_history4 + add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(), + sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', +period for system_time (sys_periodFrom, sys_periodTo); +alter table migtest_e_history4 set (system_versioning = on (history_table=dbo.migtest_e_history4_history)); +alter table migtest_e_history5 + add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(), + sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', +period for system_time (sys_periodFrom, sys_periodTo); +alter table migtest_e_history5 set (system_versioning = on (history_table=dbo.migtest_e_history5_history)); +alter table migtest_e_history6 + add sys_periodFrom datetime2 GENERATED ALWAYS AS ROW START NOT NULL DEFAULT SYSUTCDATETIME(), + sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', +period for system_time (sys_periodFrom, sys_periodTo); +alter table migtest_e_history6 set (system_versioning = on (history_table=dbo.migtest_e_history6_history)); diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql index 90c1f96bf..447a80dfc 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql @@ -66,12 +66,22 @@ create unique nonclustered index uq_migtest_e_basic_indextest4 on migtest_e_basi create unique nonclustered index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) where indextest5 is not null; alter table migtest_e_history alter column test_string numeric(19); +-- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; alter table migtest_e_history2 add default 'unknown' for test_string; alter table migtest_e_history2 alter column test_string nvarchar(255) not null; alter table migtest_e_history2 add test_string2 nvarchar(255); alter table migtest_e_history2 add test_string3 nvarchar(255) default 'unknown' not null; +alter table migtest_e_history4 alter column test_number numeric(19); +alter table migtest_e_history5 add test_boolean bit default 0 not null; + + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number1 = 42 where test_number1 is null; +alter table migtest_e_history6 add default 42 for test_number1; +alter table migtest_e_history6 alter column test_number1 integer not null; +alter table migtest_e_history6 alter column test_number2 integer; alter table migtest_e_softdelete add deleted bit default 0 not null; alter table migtest_oto_child add master_id numeric(19); @@ -102,3 +112,6 @@ alter table migtest_e_history sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', period for system_time (sys_periodFrom, sys_periodTo); alter table migtest_e_history set (system_versioning = on (history_table=dbo.migtest_e_history_history)); +-- alter table migtest_e_history3 set (system_versioning = off (history_table=dbo.migtest_e_history3_history)); +-- history migration goes here +-- alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history)); diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql index d3a7a9a24..981cfe94a 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql @@ -39,5 +39,31 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_b IF OBJECT_ID('fk_migtest_e_basic_eref_id', 'F') IS NOT NULL alter table migtest_e_basic drop constraint fk_migtest_e_basic_eref_id; alter table migtest_e_basic drop column eref_id; +-- drop column migtest_e_history2.obsolete_string1; +IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string1', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string1; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string1') drop index uq_migtest_e_history2_obsolete_string1 ON migtest_e_history2; +delimiter $$ +DECLARE @Tmp nvarchar(200);select @Tmp = t1.name from sys.default_constraints t1 + join sys.columns t2 on t1.object_id = t2.default_object_id + where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string1'; +if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$; +IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string1', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string1; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string1') drop index ix_migtest_e_history2_obsolete_string1 ON migtest_e_history2; +IF OBJECT_ID('fk_migtest_e_history2_obsolete_string1', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string1; +alter table migtest_e_history2 drop column obsolete_string1; + +-- drop column migtest_e_history2.obsolete_string2; +IF (OBJECT_ID('uq_migtest_e_history2_obsolete_string2', 'UQ') IS NOT NULL) alter table migtest_e_history2 drop constraint uq_migtest_e_history2_obsolete_string2; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'uq_migtest_e_history2_obsolete_string2') drop index uq_migtest_e_history2_obsolete_string2 ON migtest_e_history2; +delimiter $$ +DECLARE @Tmp nvarchar(200);select @Tmp = t1.name from sys.default_constraints t1 + join sys.columns t2 on t1.object_id = t2.default_object_id + where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'obsolete_string2'; +if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$; +IF (OBJECT_ID('ck_migtest_e_history2_obsolete_string2', 'C') IS NOT NULL) alter table migtest_e_history2 drop constraint ck_migtest_e_history2_obsolete_string2; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history2','U') AND name = 'ix_migtest_e_history2_obsolete_string2') drop index ix_migtest_e_history2_obsolete_string2 ON migtest_e_history2; +IF OBJECT_ID('fk_migtest_e_history2_obsolete_string2', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_obsolete_string2; +alter table migtest_e_history2 drop column obsolete_string2; + IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref; IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq; diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql index 50c300716..2294b9c01 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql @@ -53,6 +53,20 @@ DECLARE @Tmp nvarchar(200);select @Tmp = t1.name from sys.default_constraints t join sys.columns t2 on t1.object_id = t2.default_object_id where t1.parent_object_id = OBJECT_ID('migtest_e_history2') and t2.name = 'test_string'; if @Tmp is not null EXEC('alter table migtest_e_history2 drop constraint ' + @Tmp)$$; +alter table migtest_e_history2 add obsolete_string1 nvarchar(255); +alter table migtest_e_history2 add obsolete_string2 nvarchar(255); + +alter table migtest_e_history4 alter column test_number integer; +delimiter $$ +DECLARE @Tmp nvarchar(200);select @Tmp = t1.name from sys.default_constraints t1 + join sys.columns t2 on t1.object_id = t2.default_object_id + where t1.parent_object_id = OBJECT_ID('migtest_e_history6') and t2.name = 'test_number1'; +if @Tmp is not null EXEC('alter table migtest_e_history6 drop constraint ' + @Tmp)$$; + +-- NOTE: table has @History - special migration may be necessary +update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +alter table migtest_e_history6 add default 7 for test_number2; +alter table migtest_e_history6 alter column test_number2 integer not null; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic; @@ -60,3 +74,6 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_b create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id); +-- alter table migtest_e_history3 set (system_versioning = off (history_table=dbo.migtest_e_history3_history)); +-- history migration goes here +-- alter table migtest_e_history3 set (system_versioning = on (history_table=dbo.migtest_e_history3_history)); diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql index 50be4368d..96a6e677e 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql @@ -130,6 +130,19 @@ IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_h IF OBJECT_ID('fk_migtest_e_history2_test_string3', 'F') IS NOT NULL alter table migtest_e_history2 drop constraint fk_migtest_e_history2_test_string3; alter table migtest_e_history2 drop column test_string3; +-- drop column migtest_e_history5.test_boolean; +IF (OBJECT_ID('uq_migtest_e_history5_test_boolean', 'UQ') IS NOT NULL) alter table migtest_e_history5 drop constraint uq_migtest_e_history5_test_boolean; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'uq_migtest_e_history5_test_boolean') drop index uq_migtest_e_history5_test_boolean ON migtest_e_history5; +delimiter $$ +DECLARE @Tmp nvarchar(200);select @Tmp = t1.name from sys.default_constraints t1 + join sys.columns t2 on t1.object_id = t2.default_object_id + where t1.parent_object_id = OBJECT_ID('migtest_e_history5') and t2.name = 'test_boolean'; +if @Tmp is not null EXEC('alter table migtest_e_history5 drop constraint ' + @Tmp)$$; +IF (OBJECT_ID('ck_migtest_e_history5_test_boolean', 'C') IS NOT NULL) alter table migtest_e_history5 drop constraint ck_migtest_e_history5_test_boolean; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_history5','U') AND name = 'ix_migtest_e_history5_test_boolean') drop index ix_migtest_e_history5_test_boolean ON migtest_e_history5; +IF OBJECT_ID('fk_migtest_e_history5_test_boolean', 'F') IS NOT NULL alter table migtest_e_history5 drop constraint fk_migtest_e_history5_test_boolean; +alter table migtest_e_history5 drop column test_boolean; + -- drop column migtest_e_softdelete.deleted; IF (OBJECT_ID('uq_migtest_e_softdelete_deleted', 'UQ') IS NOT NULL) alter table migtest_e_softdelete drop constraint uq_migtest_e_softdelete_deleted; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_softdelete','U') AND name = 'uq_migtest_e_softdelete_deleted') drop index uq_migtest_e_softdelete_deleted ON migtest_e_softdelete;