diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index 50c6a4635..baa6016b5 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java @@ -46,7 +46,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { handler.generate(write, Helper.getDropColumn()); - assertThat(write.apply().getBuffer()).isEqualTo("alter table foo drop column col2;\n\n"); + assertThat(write.drop().getBuffer()).isEqualTo("alter table foo drop column col2;\n\n"); assertThat(write.rollback().getBuffer()).isEqualTo(""); } @@ -77,6 +77,7 @@ public class BaseDdlHandlerTest extends BaseTestCase { String rollbackLast = Helper.asText(this, "/assert/BaseDdlHandlerTest/rollback.sql"); assertThat(write.apply().getBuffer()).isEqualTo(apply); + assertThat(write.drop().getBuffer()).isEqualTo("alter table foo drop column col2;\n\n"); assertThat(write.rollback().getBuffer()).isEqualTo(rollbackLast); } diff --git a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index 635f17f5e..d02a01e45 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -69,14 +69,14 @@ public class PlatformDdl_AlterColumnTest { sql = pgDdl.alterColumnType("mytab", "acol", "varchar(20)"); assertEquals("alter table mytab alter column acol type varchar(20)", sql); - sql = sqlServerDdl.alterColumnType("mytab", "acol", "varchar(20)"); - assertEquals("alter table mytab alter column acol varchar(20)", sql); - sql = oraDdl.alterColumnType("mytab", "acol", "varchar(20)"); assertEquals("alter table mytab modify acol varchar(20)", sql); sql = mysqlDdl.alterColumnType("mytab", "acol", "varchar(20)"); assertNull(sql); + + sql = sqlServerDdl.alterColumnType("mytab", "acol", "varchar(20)"); + assertNull(sql); } @Test diff --git a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java b/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java index cd55c8249..e0fc842f1 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/model/MColumnTest.java @@ -124,7 +124,7 @@ public class MColumnTest { oldCol.compare(diff, table, newCol); assertChanges(diff); - assertThat(getAlterColumn(diff).getDefaultValue()).isNull(); + assertThat(getAlterColumn(diff).getDefaultValue()).isEqualTo("DROP DEFAULT"); } @Test