#559 - DDL - DB Migration refactor - remove rollback.ddl generation (ultimately not used by FlywayDb etc)

src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/BaseDdlHandlerTest.java

@@ -35,7 +35,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     handler.generate(write, Helper.getAddColumn());
 
     assertThat(write.apply().getBuffer()).isEqualTo("alter table foo add column added_to_foo varchar(20);\n\n");
-    assertThat(write.rollback().getBuffer()).isEqualTo("alter table foo drop column added_to_foo;\n\n");
+    assertThat(write.dropAll().getBuffer()).isEqualTo("");
   }
 
   @Test
@@ -47,7 +47,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.rollback().getBuffer()).isEqualTo("");
+    assertThat(write.dropAll().getBuffer()).isEqualTo("");
   }
 
 
@@ -62,7 +62,7 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     String createTableDDL = Helper.asText(this, "/assert/create-table.txt");
 
     assertThat(write.apply().getBuffer()).isEqualTo(createTableDDL);
-    assertThat(write.rollback().getBuffer().trim()).isEqualTo("drop table if exists foo;\ndrop sequence if exists foo_seq;");
+    assertThat(write.dropAll().getBuffer().trim()).isEqualTo("drop table if exists foo;\ndrop sequence if exists foo_seq;");
   }
 
   @Test
@@ -74,10 +74,10 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     handler.generate(write, Helper.getChangeSet());
 
     String apply = Helper.asText(this, "/assert/BaseDdlHandlerTest/apply.sql");
-    String rollbackLast = Helper.asText(this, "/assert/BaseDdlHandlerTest/rollback.sql");
+    String rollbackLast = Helper.asText(this, "/assert/BaseDdlHandlerTest/drop-all.sql");
 
     assertThat(write.apply().getBuffer()).isEqualTo(apply);
-    assertThat(write.rollback().getBuffer()).isEqualTo(rollbackLast);
+    assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast);
   }
 
 
@@ -95,10 +95,10 @@ public class BaseDdlHandlerTest extends BaseTestCase {
     handler.generate(write, createChangeSet);
 
     String apply = Helper.asText(this, "/assert/changeset-apply.txt");
-    String rollbackLast = Helper.asText(this, "/assert/changeset-rollback.txt");
+    String rollbackLast = Helper.asText(this, "/assert/changeset-dropAll.txt");
 
     assertThat(write.apply().getBuffer()).isEqualTo(apply);
-    assertThat(write.rollback().getBuffer()).isEqualTo(rollbackLast);
+    assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast);
   }
 
   @Ignore
@@ -121,8 +121,8 @@ public class BaseDdlHandlerTest extends BaseTestCase {
 
     assertThat(write.apply().getBuffer()).isEqualTo(apply);
     assertThat(write.applyForeignKeys().getBuffer()).isEqualTo(applyLast);
-    assertThat(write.rollbackForeignKeys().getBuffer()).isEqualTo(rollbackFirst);
-    assertThat(write.rollback().getBuffer()).isEqualTo(rollbackLast);
+    assertThat(write.dropAllForeignKeys().getBuffer()).isEqualTo(rollbackFirst);
+    assertThat(write.dropAll().getBuffer()).isEqualTo(rollbackLast);
   }
 
 }

src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/BaseTableDdlTest.java

@@ -29,8 +29,8 @@ public class BaseTableDdlTest {
     String apply = write.apply().getBuffer();
     String applyLast = write.applyForeignKeys().getBuffer();
 
-    String rollbackFirst = write.rollbackForeignKeys().getBuffer();
-    String rollbackLast = write.rollback().getBuffer();
+    String rollbackFirst = write.dropAllForeignKeys().getBuffer();
+    String rollbackLast = write.dropAll().getBuffer();
 
     assertThat(apply).isEqualTo(Helper.asText(this, "/assert/BaseTableDdlTest/createTable-apply.txt"));
     assertThat(applyLast).isEqualTo(Helper.asText(this, "/assert/BaseTableDdlTest/createTable-applyLast.txt"));

src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/H2HistoryDdlTest.java

@@ -35,7 +35,7 @@ public class H2HistoryDdlTest {
 
     assertThat(write.applyHistory().isEmpty()).isFalse();
     assertThat(write.applyHistory().getBuffer()).contains("add one");
-    assertThat(write.rollback().isEmpty()).isFalse();
+    assertThat(write.dropAll().isEmpty()).isTrue();
 
   }
 }

src/test/java/com/avaje/ebean/dbmigration/ddlgeneration/platform/HistoryTableUpdateTest.java

@@ -2,61 +2,11 @@ package com.avaje.ebean.dbmigration.ddlgeneration.platform;
 
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 public class HistoryTableUpdateTest {
 
-  @Test
-  public void testToRevertedColumns_add() throws Exception {
-
-    HistoryTableUpdate upd = new HistoryTableUpdate("mytab");
-    assertThat(upd.getBaseTable()).isEqualTo("mytab");
-
-    upd.add(HistoryTableUpdate.Change.ADD, "two");
-
-    List<String> current = current();
-    upd.toRevertedColumns(current);
-    assertThat(current).contains("one","three");
-  }
-
-  @Test
-  public void testToRevertedColumns_include() throws Exception {
-
-    HistoryTableUpdate upd = new HistoryTableUpdate("mytab");
-    upd.add(HistoryTableUpdate.Change.INCLUDE, "two");
-
-    List<String> current = current();
-    upd.toRevertedColumns(current);
-    assertThat(current).contains("one","three");
-  }
-
-  @Test
-  public void testToRevertedColumns_drop() throws Exception {
-
-    HistoryTableUpdate upd = new HistoryTableUpdate("mytab");
-    upd.add(HistoryTableUpdate.Change.DROP, "three");
-
-    List<String> current = current();
-    upd.toRevertedColumns(current);
-    assertThat(current).contains("one","two","three");
-  }
-
-  @Test
-  public void testToRevertedColumns_exclude() throws Exception {
-
-    HistoryTableUpdate upd = new HistoryTableUpdate("mytab");
-    upd.add(HistoryTableUpdate.Change.EXCLUDE, "four");
-
-    List<String> current = current();
-    upd.toRevertedColumns(current);
-    assertThat(current).contains("one","two","three","four");
-  }
-
-
   @Test
   public void testDescription() throws Exception {
 
@@ -79,12 +29,4 @@ public class HistoryTableUpdateTest {
     assertThat(upd.description()).isEqualTo("[add two, include five, exclude six, drop four]");
   }
 
-  List<String> current() {
-
-    List<String> currentColumns = new ArrayList<String>();
-    currentColumns.add("one");
-    currentColumns.add("two");
-    currentColumns.add("three");
-    return currentColumns;
-  }
 }