From d927b8c2c2ad3e870cdb665ce851f75a595eded3 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 11 Mar 2022 15:34:37 +0100 Subject: [PATCH] [DDL-refactor] Sorted the statements, so that they are going to the correct buffers --- .../dbmigration/ddlgeneration/DdlWrite.java | 13 +- .../ddlgeneration/platform/BaseTableDdl.java | 4 +- .../platform/DbTriggerBasedHistoryDdl.java | 16 +- .../ddlgeneration/platform/MySqlDdl.java | 8 +- .../ddlgeneration/platform/PlatformDdl.java | 15 ++ .../ddlgeneration/platform/PostgresDdl.java | 9 +- .../platform/PostgresHistoryDdl.java | 11 +- .../ddlgeneration/platform/SqlServerDdl.java | 27 +-- .../platform/SqlServerHistoryDdl.java | 20 +- .../platform/PlatformDdl_AlterColumnTest.java | 175 +++++++++++------- 10 files changed, 178 insertions(+), 120 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java index 701887824..c8ac57fcd 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlWrite.java @@ -11,7 +11,18 @@ import io.ebeaninternal.dbmigration.model.MTable; import io.ebeaninternal.dbmigration.model.ModelContainer; /** - * Write context holding the buffers for both apply and rollback DDL. + * Write context holding the buffers for both apply and rollback DDL. Description of the apply buffers: + * */ public class DdlWrite { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index dd1a2f282..85e0e4624 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -558,7 +558,7 @@ public class BaseTableDdl implements TableDdl { @Override public void generate(DdlWrite writer, CreateIndex index) { if (platformInclude(index.getPlatforms())) { - writer.applyPostAlter().appendStatement(platformDdl.createIndex(new WriteCreateIndex(index))); + writer.applyForeignKeys().appendStatement(platformDdl.createIndex(new WriteCreateIndex(index))); writer.dropAll().appendStatement(platformDdl.dropIndex(index.getIndexName(), index.getTableName(), Boolean.TRUE.equals(index.isConcurrent()))); } } @@ -678,7 +678,7 @@ public class BaseTableDdl implements TableDdl { if (!hasValue(sequenceName)) { sequenceName = namingConvention.getSequenceName(dropTable.getName(), dropTable.getSequenceCol()); } - dropSequence(writer.apply(), sequenceName); + dropSequence(writer.applyPostAlter(), sequenceName); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index 10644a8a1..e85a6055f 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -109,7 +109,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { String baseTable = table.getName(); - addSysPeriodColumns(writer.apply(), baseTable, table.getWhenCreatedColumn()); + addSysPeriodColumns(writer, baseTable, table.getWhenCreatedColumn()); createHistoryTable(writer.applyPostAlter(), table); createTriggers(writer, table); @@ -161,20 +161,18 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { DdlBuffer apply = writer.applyHistoryView(); - addSysPeriodColumns(apply, baseTableName, whenCreatedColumn); + addSysPeriodColumns(writer, baseTableName, whenCreatedColumn); createHistoryTable(writer.applyPostAlter(), table); createWithHistoryView(apply, baseTableName); } - protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) { - - apply.append("alter table ").append(baseTableName).append(" add column ") - .append(sysPeriodStart).append(" ").append(sysPeriodType).append(" default ").append(now).endOfStatement(); - apply.append("alter table ").append(baseTableName).append(" add column ") - .append(sysPeriodEnd).append(" ").append(sysPeriodType).endOfStatement(); + protected void addSysPeriodColumns(DdlWrite writer, String baseTableName, String whenCreatedColumn) { + platformDdl.alterTableAddColumn(writer, baseTableName, sysPeriodStart, sysPeriodType, now); + platformDdl.alterTableAddColumn(writer, baseTableName, sysPeriodEnd, sysPeriodType, null); if (whenCreatedColumn != null) { - apply.append("update ").append(baseTableName).append(" set ").append(sysPeriodStart).append(" = ").append(whenCreatedColumn).endOfStatement(); + writer.applyPostAlter() + .append("update ").append(baseTableName).append(" set ").append(sysPeriodStart).append(" = ").append(whenCreatedColumn).endOfStatement(); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java index 492584fd5..3ce034b46 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/MySqlDdl.java @@ -40,7 +40,7 @@ public class MySqlDdl extends PlatformDdl { @Override public void alterTableDropColumn(DdlWrite writer, String tableName, String columnName) { if (this.useMigrationStoredProcedures) { - writer.apply().append("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')").endOfStatement(); + alterTable(writer, tableName).raw("CALL usp_ebean_drop_column('").append(tableName).append("', '").append(columnName).append("')"); } else { super.alterTableDropColumn(writer, tableName, columnName); } @@ -108,16 +108,14 @@ public class MySqlDdl extends PlatformDdl { boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull()); String defaultValue = alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue(); - DdlBuffer buffer = writer.apply().append("alter table ").append(tableName) - .appendWithSpace("modify").appendWithSpace(columnName); - buffer.appendWithSpace(type); + DdlBuffer buffer = alterTable(writer, tableName).append("modify", columnName); + buffer.append(type); if (notnull) { buffer.append(" not null"); } if (hasValue(defaultValue) && !DdlHelp.isDropDefault(defaultValue)) { buffer.append(" default ").append(convertDefaultValue(defaultValue)); } - buffer.endOfStatement(); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java index 454682a04..3011f2c4a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -555,6 +555,21 @@ public class PlatformDdl { } + /** + * This method is used from DbTriggerBasedHistoryDdl to add the sysPeriodColumns. + */ + public void alterTableAddColumn(DdlWrite writer, String tableName, String columnName, String columnType, String defaultValue) { + + String convertedType = convert(columnType); + DdlBuffer buffer = alterTable(writer, tableName).append(addColumn, columnName); + buffer.append(convertedType); + + if (defaultValue != null) { + buffer.append(" default "); + buffer.append(defaultValue); + } + } + public void alterTableDropColumn(DdlWrite writer, String tableName, String columnName) { alterTable(writer, tableName).append(dropColumn, columnName); } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java index 984333fbb..1618cfd9e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresDdl.java @@ -60,11 +60,8 @@ public class PostgresDdl extends PlatformDdl { @Override protected void alterColumnType(DdlWrite writer, AlterColumn alter) { String type = convert(alter.getType()); - - writer.apply().append("alter table ").append(alter.getTableName()) - .appendWithSpace(alterColumn).appendWithSpace(alter.getColumnName()) - .appendWithSpace(columnSetType).append(type) - .append(" using ").append(alter.getColumnName()).append("::").append(type) - .endOfStatement(); + alterTable(writer, alter.getTableName()).append(alterColumn, alter.getColumnName()) + .append(columnSetType).append(type) + .append(" using ").append(alter.getColumnName()).append("::").append(type); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java index 228b1c529..e4d4d41aa 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java @@ -29,14 +29,11 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { * Use Postgres range type rather than start and end timestamps. */ @Override - protected void addSysPeriodColumns(DdlBuffer apply, String baseTableName, String whenCreatedColumn) { - apply - .append("alter table ").append(baseTableName) - .append(" add column ").append(sysPeriod).append(" tstzrange not null default tstzrange(").append(now).append(", null)") - .endOfStatement(); - + protected void addSysPeriodColumns(DdlWrite writer, String baseTableName, String whenCreatedColumn) { + platformDdl.alterTableAddColumn(writer, baseTableName, sysPeriod, "tstzrange not null", "tstzrange(" + now + ", null)"); if (whenCreatedColumn != null) { - apply.append("update ").append(baseTableName).append(" set ") + writer.applyPostAlter() + .append("update ").append(baseTableName).append(" set ") .append(sysPeriod).append(" = tstzrange(").append(whenCreatedColumn).append(", null)").endOfStatement(); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java index 0cd256c30..b3d27ddee 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java @@ -142,9 +142,9 @@ public class SqlServerDdl extends PlatformDdl { String columnName = alter.getColumnName(); String defaultValue = alter.getDefaultValue(); if (DdlHelp.isDropDefault(defaultValue)) { - writer.apply().appendStatement(execUspDropDefaultConstraint(tableName, columnName)); + execUspDropDefaultConstraint(writer, tableName, columnName); } else { - writer.apply().appendStatement(execUspDropDefaultConstraint(tableName, columnName)); + execUspDropDefaultConstraint(writer, tableName, columnName); setDefaultValue(writer, tableName, columnName, defaultValue); } } @@ -164,21 +164,17 @@ public class SqlServerDdl extends PlatformDdl { type = convert(type); boolean notnull = (alter.isNotnull() != null) ? alter.isNotnull() : Boolean.TRUE.equals(alter.isCurrentNotnull()); String defaultValue = alter.getDefaultValue() != null ? alter.getDefaultValue() : alter.getCurrentDefaultValue(); - DdlBuffer buffer = writer.apply(); if (hasValue(defaultValue)) { // default value present -> drop default constraint before altering - buffer.appendStatement(execUspDropDefaultConstraint(tableName, columnName)); + execUspDropDefaultConstraint(writer, tableName, columnName); } - buffer = writer.apply().append("alter table ").append(tableName) - .appendWithSpace(alterColumn).appendWithSpace(columnName); - buffer.appendWithSpace(type); + DdlBuffer buffer = alterTable(writer, tableName).append(alterColumn, columnName); + buffer.append(type); if (notnull) { buffer.append(" not null"); } - buffer.endOfStatement(); - // re add - default constraint if (hasValue(defaultValue) && !DdlHelp.isDropDefault(defaultValue)) { setDefaultValue(writer, tableName, columnName, defaultValue); @@ -210,7 +206,7 @@ public class SqlServerDdl extends PlatformDdl { */ @Override public void alterTableDropColumn(DdlWrite writer, String tableName, String columnName) { - writer.apply().append("EXEC usp_ebean_drop_column ").append(tableName).append(", ").append(columnName).endOfStatement(); + alterTable(writer, tableName).raw("EXEC usp_ebean_drop_column ").append(tableName).append(", ").append(columnName); } /** @@ -252,18 +248,15 @@ public class SqlServerDdl extends PlatformDdl { .endOfStatement(); } - private String ifObjectExists(String object, String objectType) { + public static String ifObjectExists(String object, String objectType) { return "IF OBJECT_ID('" + object + "', '" + objectType + "') IS NOT NULL "; } - private String execUspDropDefaultConstraint(String tableName, String columnName) { - return "EXEC usp_ebean_drop_default_constraint " + tableName + ", " + columnName; + private void execUspDropDefaultConstraint(DdlWrite writer, String tableName, String columnName) { + alterTable(writer, tableName).raw("EXEC usp_ebean_drop_default_constraint " + tableName + ", " + columnName); } private void setDefaultValue(DdlWrite writer, String tableName, String columnName, String defaultValue) { - writer.apply().append("alter table ").append(tableName) - .append(" add default ").append(convertDefaultValue(defaultValue)).append(" for ").append(columnName) - .endOfStatement(); + alterTable(writer, tableName).append("add default " + convertDefaultValue(defaultValue) + " for", columnName); } - } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java index 812389c2d..7a10110e3 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerHistoryDdl.java @@ -60,27 +60,25 @@ public class SqlServerHistoryDdl implements PlatformHistoryDdl { @Override public void dropHistoryTable(DdlWrite writer, DropHistoryTable dropHistoryTable) { String baseTable = dropHistoryTable.getBaseTable(); - DdlBuffer apply = writer.applyHistoryView(); - apply.append("-- dropping history support for ").append(baseTable).endOfStatement(); // drop default constraints - DdlWrite tmpWriter = new DdlWrite(); AlterColumn alter = new AlterColumn(); alter.setTableName(baseTable); alter.setDefaultValue(DdlHelp.DROP_DEFAULT); alter.setColumnName(systemPeriodStart); - platformDdl.alterColumn(tmpWriter, alter); + platformDdl.alterColumn(writer, alter); alter.setColumnName(systemPeriodEnd); - platformDdl.alterColumn(tmpWriter, alter); - apply.append(tmpWriter.apply().getBuffer()); // workaround - will be refactored later + platformDdl.alterColumn(writer, alter); - // switch of versioning & period + // switch of versioning & period - must be done before altering + DdlBuffer apply = writer.apply(); + apply.append("-- dropping history support for ").append(baseTable).endOfStatement(); apply.append("alter table ").append(baseTable).append(" set (system_versioning = off)").endOfStatement(); apply.append("alter table ").append(baseTable).append(" drop period for system_time").endOfStatement(); - // now drop tables & columns - apply.append("alter table ").append(baseTable).append(" drop column ").append(systemPeriodStart).endOfStatement(); - apply.append("alter table ").append(baseTable).append(" drop column ").append(systemPeriodEnd).endOfStatement(); - apply.append("IF OBJECT_ID('").append(baseTable).append("_history', 'U') IS NOT NULL drop table ").append(baseTable).append("_history").endOfStatement(); apply.end(); + // now drop tables & columns, they will go to alter table/post alter buffers + platformDdl.alterTableDropColumn(writer, baseTable, systemPeriodStart); + platformDdl.alterTableDropColumn(writer, baseTable, systemPeriodEnd); + writer.applyPostAlter().appendStatement(platformDdl.dropTable(baseTable + "_history")); } @Override diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 93042bce0..c6d884c3a 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -19,7 +19,6 @@ import io.ebeaninternal.dbmigration.migration.Column; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; - import org.assertj.core.api.SoftAssertions; public class PlatformDdl_AlterColumnTest { @@ -101,36 +100,40 @@ public class PlatformDdl_AlterColumnTest { alter.setType("varchar(50)"); // and alter type String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol varchar(50);\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol varchar(50);\n" + "alter table mytab alter column acol set default 'hi';\n" + "alter table mytab alter column acol set not null;\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "alter table mytab alter column acol type varchar(50) using acol::varchar(50);\n" - + "-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n" + + "alter table mytab alter column acol set default 'hi';\n" + "alter table mytab alter column acol set not null;\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol varchar2(50);\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol varchar2(50);\n" + "alter table mytab modify acol default 'hi';\n" + "alter table mytab modify acol not null;\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "alter table mytab modify acol varchar(50) not null default 'hi';\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n" + "alter table mytab alter column acol nvarchar(50) not null;\n" + "alter table mytab add default 'hi' for acol;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(50) default 'hi' not null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(50) default 'hi' not null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set data type varchar(50);\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set data type varchar(50);\n" + "alter table mytab alter column acol set default 'hi';\n" + "alter table mytab alter column acol set not null;\n"); @@ -141,31 +144,36 @@ public class PlatformDdl_AlterColumnTest { alter.setType(null); // do not alter type sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n" + "alter table mytab alter column acol set null;\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n" + "alter table mytab alter column acol drop not null;\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol default null;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol default null;\n" + "alter table mytab modify acol null;\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "alter table mytab modify acol varchar(5);\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n" + "alter table mytab alter column acol nvarchar(5);\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(5) default null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(5) default null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n" + "alter table mytab alter column acol drop not null;\n"); } @@ -180,40 +188,50 @@ public class PlatformDdl_AlterColumnTest { alter.setType("varchar(20)"); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol varchar(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol varchar(20);\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nalter table mytab alter column acol type varchar(20) using acol::varchar(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol type varchar(20) using acol::varchar(20);\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol varchar2(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol varchar2(20);\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nalter table mytab modify acol varchar(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol varchar(20);\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nalter table mytab alter column acol nvarchar(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol nvarchar(20);\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20));\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20));\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set data type varchar(20);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set data type varchar(20);\n"); alter.setType("bigint"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nalter table mytab alter column acol type bigint using acol::bigint;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol type bigint using acol::bigint;\n"); alter.setCurrentType("bigint"); alter.setType("integer"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol decimal);\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol decimal);\n" + "alter table mytab alter (acol integer);\n"); alter.setCurrentType("varchar(20)"); alter.setType("varchar(10)"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nclob);\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nclob);\n" + "alter table mytab alter (acol nvarchar(10));\n"); } @@ -228,27 +246,32 @@ public class PlatformDdl_AlterColumnTest { alter.setNotnull(Boolean.TRUE); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set not null;\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set not null;\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol not null;\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "alter table mytab modify acol varchar(20) not null;\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "alter table mytab alter column acol nvarchar(20) not null;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20) not null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20) not null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set not null;\n"); } @@ -264,27 +287,34 @@ public class PlatformDdl_AlterColumnTest { alter.setNotnull(Boolean.FALSE); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set null;\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop not null;\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol null;\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nalter table mytab modify acol varchar(20) default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol varchar(20) default 'hi';\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nEXEC usp_ebean_drop_default_constraint mytab, acol;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n" + "alter table mytab alter column acol nvarchar(20);\n" + "alter table mytab add default 'hi' for acol;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20) default 'hi');\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20) default 'hi');\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop not null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop not null;\n"); } @Test @@ -297,27 +327,33 @@ public class PlatformDdl_AlterColumnTest { alter.setDefaultValue("'hi'"); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol default 'hi';\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter acol set default 'hi';\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n" + "alter table mytab add default 'hi' for acol;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20) default 'hi' not null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20) default 'hi' not null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); } @Test @@ -331,26 +367,33 @@ public class PlatformDdl_AlterColumnTest { alter.setDefaultValue("'hi'"); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol default 'hi';\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter acol set default 'hi';\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nEXEC usp_ebean_drop_default_constraint mytab, acol;\n" + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n" + "alter table mytab add default 'hi' for acol;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20) default 'hi' not null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20) default 'hi' not null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol set default 'hi';\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol set default 'hi';\n"); } @Test @@ -365,25 +408,32 @@ public class PlatformDdl_AlterColumnTest { alter.setDefaultValue("DROP DEFAULT"); String sql = alterColumn(h2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n"); sql = alterColumn(pgDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n"); sql = alterColumn(oraDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab modify acol default null;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab modify acol default null;\n"); sql = alterColumn(mysqlDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter acol drop default;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter acol drop default;\n"); sql = alterColumn(sqlServerDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply changes\nEXEC usp_ebean_drop_default_constraint mytab, acol;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "EXEC usp_ebean_drop_default_constraint mytab, acol;\n"); sql = alterColumn(hanaDdl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter (acol nvarchar(20) default null not null);\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter (acol nvarchar(20) default null not null);\n"); sql = alterColumn(db2Ddl, alter); - softly.assertThat(sql).isEqualTo("-- apply alter tables\nalter table mytab alter column acol drop default;\n"); + softly.assertThat(sql).isEqualTo("-- apply alter tables\n" + + "alter table mytab alter column acol drop default;\n"); } @@ -392,7 +442,8 @@ public class PlatformDdl_AlterColumnTest { DdlWrite writer = new DdlWrite(); oraDdl.alterTableAddColumn(writer, "my_table", simpleColumn(), false, "1"); softly.assertThat(writer.toString()) - .isEqualTo("-- apply alter tables\nalter table my_table add my_column int default 1 not null;\n"); + .isEqualTo("-- apply alter tables\n" + + "alter table my_table add my_column int default 1 not null;\n"); } private Column simpleColumn() {