Merge pull request #2933 from FOCONIS/bugfix/drop_table_drop_foreign_keys

Drop table statements potentially not possible due to foreign key constraints

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java

@@ -1,5 +1,6 @@
 package io.ebeaninternal.dbmigration.model;
 
+import io.ebeaninternal.dbmigration.ddlgeneration.platform.DdlHelp;
 import io.ebeaninternal.dbmigration.migration.*;
 
 import java.util.ArrayList;
@@ -125,6 +126,21 @@ public class ModelDiff {
     // search for tables that are no longer used
     for (MTable existingTable : baseModel.getTables().values()) {
       if (!newTables.containsKey(existingTable.getName())) {
+        // Compounded foreign keys used in many-to-many mapping tables
+        existingTable.getCompoundKeys().forEach(it -> addAlterForeignKey(it.dropForeignKey(existingTable.getName())));
+        // Foreign keys through direct mapping (oneToMany)
+        existingTable.allColumns().stream()
+          .filter(it -> it.getForeignKeyIndex() != null)
+          .map(it -> {
+            AlterForeignKey fk = new AlterForeignKey();
+            fk.setName(it.getForeignKeyName());
+            fk.setIndexName(it.getForeignKeyIndex());
+            fk.setColumnNames(DdlHelp.DROP_FOREIGN_KEY);
+            fk.setTableName(existingTable.getName());
+            return fk;
+          })
+          .forEach(applyChanges::add);
+
         addDropTable(existingTable);
       }
     }

ebean-test/src/test/java/misc/migration/v1_0/DropMain.java

@@ -0,0 +1,48 @@
+package misc.migration.v1_0;
+
+import javax.persistence.*;
+import java.util.List;
+
+/**
+ * Test-model referencing two other tables, which gets dropped for migration test in order to check for correct table drop
+ * procedure (first drop foreign keys, then the tables).
+ *
+ * @author Jonas Pöhler, FOCONIS AG
+ */
+@Entity
+@Table(name = "drop_main")
+public class DropMain {
+
+  @Id
+  Integer id;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "parent")
+  List<DropRefOne> refsOne;
+
+  @ManyToMany(cascade = CascadeType.ALL)
+  List<DropRefMany> refsMany;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public List<DropRefOne> getRefsOne() {
+    return refsOne;
+  }
+
+  public void setRefsOne(List<DropRefOne> refsOne) {
+    this.refsOne = refsOne;
+  }
+
+  public List<DropRefMany> getRefsMany() {
+    return refsMany;
+  }
+
+  public void setRefsMany(List<DropRefMany> refsMany) {
+    this.refsMany = refsMany;
+  }
+}

ebean-test/src/test/java/misc/migration/v1_0/DropRefMany.java

@@ -0,0 +1,35 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import java.util.List;
+
+@Entity
+@Table(name = "drop_ref_many")
+public class DropRefMany {
+
+  @Id
+  Integer id;
+
+  @ManyToMany(cascade = {}, mappedBy = "refsMany")
+  List<DropMain> parents;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public List<DropMain> getParents() {
+    return parents;
+  }
+
+  public void setParents(List<DropMain> parents) {
+    this.parents = parents;
+  }
+}

ebean-test/src/test/java/misc/migration/v1_0/DropRefOne.java

@@ -0,0 +1,33 @@
+package misc.migration.v1_0;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "drop_ref_one")
+public class DropRefOne {
+
+  @Id
+  Integer id;
+
+  @ManyToOne(cascade = {})
+  DropMain parent;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public DropMain getParent() {
+    return parent;
+  }
+
+  public void setParent(DropMain parent) {
+    this.parent = parent;
+  }
+}

ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql

@@ -45,6 +45,24 @@ create table migtest_fk_set_null (
   one_id                        UInt64
 ) ENGINE = Log();
 
+create table drop_main (
+  id                            UInt32
+) ENGINE = Log();
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  UInt32,
+  drop_ref_many_id              UInt32
+) ENGINE = Log();
+
+create table drop_ref_many (
+  id                            UInt32
+) ENGINE = Log();
+
+create table drop_ref_one (
+  id                            UInt32,
+  parent_id                     UInt32
+) ENGINE = Log();
+
 create table migtest_e_basic (
   id                            UInt32,
   status                        String,

ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql

@@ -7,5 +7,9 @@ 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;
 -- apply post alter
+drop table if exists drop_main;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop table if exists drop_ref_one;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;

ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations

@@ -1,6 +1,6 @@
-193400547,      1.0__initial.sql
+1672735407,     1.0__initial.sql
 540706946,      1.1.sql
-688811494,      1.2__dropsFor_1.1.sql
+-875723380,     1.2__dropsFor_1.1.sql
 1015552567,     1.3.sql
 255653518,      1.4__dropsFor_1.3.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -193,6 +215,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 drop index uq_migtest_e_basic_indextest2 cascade;
 drop index uq_migtest_e_basic_indextest6 cascade;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table if exists drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql

@@ -7,6 +7,13 @@ 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;
 -- apply post alter
+drop table if exists drop_main cascade;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many cascade;
+drop table if exists drop_ref_many cascade;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one cascade;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd" cascade;
 drop table if exists migtest_e_ref cascade;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql

@@ -14,6 +14,11 @@ drop index uq_migtest_e_basic_name cascade;
 drop index uq_migtest_e_basic_indextest4 cascade;
 drop index uq_migtest_e_basic_indextest5 cascade;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table if exists migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations

@@ -1,7 +1,7 @@
-1434934404,     1.0__initial.sql
-1284257915,     1.1.sql
-856096334,      1.2__dropsFor_1.1.sql
--1551362011,    1.3.sql
+1867456246,     1.0__initial.sql
+-412570267,     1.1.sql
+395394572,      1.2__dropsFor_1.1.sql
+-861259583,     1.3.sql
 -971909974,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -232,6 +254,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql

@@ -65,6 +65,27 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_MAIN' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_main';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_REF_MANY' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_ref_many';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_REF_ONE_PARENT_ID' and ucase(tabname) = 'DROP_REF_ONE') then
+  prepare stmt from 'alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest1';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql

@@ -15,6 +15,31 @@ alter table migtest_e_history2_history drop column obsolete_string2;
 call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
+drop table drop_main;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_MAIN_SEQ') then
+  prepare stmt from 'drop sequence drop_main_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_main_drop_ref_many;
+drop table drop_ref_many;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_MANY_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_many_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_ref_one;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_ONE_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_one_seq';
+  execute stmt;
+end if;
+end$$;
 drop table "migtest_QuOtEd";
 drop table migtest_e_ref;
 delimiter $$

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql

@@ -135,6 +135,41 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_PHONE_NUMBERS_MIGTEST_MTM_M_ID' and ucase(tabname) = 'MIGTEST_MTM_M_PHONE_NUMBERS') then
+  prepare stmt from 'alter table migtest_mtm_m_phone_numbers drop constraint fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest3';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations

@@ -1,7 +1,7 @@
--1467839063,    1.0__initial.sql
--184000413,     1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
--150875853,     1.3.sql
+-283216660,     1.0__initial.sql
+1120848440,     1.1.sql
+135256939,      1.2__dropsFor_1.1.sql
+-2139056187,    1.3.sql
 946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -194,6 +216,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql

@@ -7,5 +7,9 @@ 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;
 -- apply post alter
+drop table if exists drop_main;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop table if exists drop_ref_one;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_generic.migrations

@@ -1,6 +1,6 @@
--1547037623,    1.0__initial.sql
-253988246,      1.1.sql
-688811494,      1.2__dropsFor_1.1.sql
-509168727,      1.3.sql
+-528359263,     1.0__initial.sql
+-1374084944,    1.1.sql
+-875723380,     1.2__dropsFor_1.1.sql
+-819139044,     1.3.sql
 255653518,      1.4__dropsFor_1.3.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -232,6 +254,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql

@@ -65,6 +65,27 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_MAIN' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_main';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_REF_MANY' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_ref_many';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_REF_ONE_PARENT_ID' and ucase(tabname) = 'DROP_REF_ONE') then
+  prepare stmt from 'alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest1';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql

@@ -15,6 +15,31 @@ alter table migtest_e_history2_history drop column obsolete_string2;
 call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
+drop table drop_main;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_MAIN_SEQ') then
+  prepare stmt from 'drop sequence drop_main_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_main_drop_ref_many;
+drop table drop_ref_many;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_MANY_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_many_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_ref_one;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_ONE_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_one_seq';
+  execute stmt;
+end if;
+end$$;
 drop table "migtest_QuOtEd";
 drop table migtest_e_ref;
 delimiter $$

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql

@@ -135,6 +135,41 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_PHONE_NUMBERS_MIGTEST_MTM_M_ID' and ucase(tabname) = 'MIGTEST_MTM_M_PHONE_NUMBERS') then
+  prepare stmt from 'alter table migtest_mtm_m_phone_numbers drop constraint fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest3';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations

@@ -1,8 +1,8 @@
 1307787475,     I__create_tablespaces.sql
-2058232717,     1.0__initial.sql
--1450326352,    1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
-1976888196,     1.3.sql
+1681764655,     1.0__initial.sql
+1259437403,     1.1.sql
+135256939,      1.2__dropsFor_1.1.sql
+1091218936,     1.3.sql
 946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -232,6 +254,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql

@@ -65,6 +65,27 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_MAIN' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_main';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_MAIN_DROP_REF_MANY_DROP_REF_MANY' and ucase(tabname) = 'DROP_MAIN_DROP_REF_MANY') then
+  prepare stmt from 'alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_ref_many';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_DROP_REF_ONE_PARENT_ID' and ucase(tabname) = 'DROP_REF_ONE') then
+  prepare stmt from 'alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest1';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql

@@ -15,6 +15,31 @@ alter table migtest_e_history2_history drop column obsolete_string2;
 call sysproc.admin_cmd('reorg table migtest_e_history2_history');
 -- apply post alter
 alter table migtest_e_history2 add versioning use history table migtest_e_history2_history;
+drop table drop_main;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_MAIN_SEQ') then
+  prepare stmt from 'drop sequence drop_main_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_main_drop_ref_many;
+drop table drop_ref_many;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_MANY_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_many_seq';
+  execute stmt;
+end if;
+end$$;
+drop table drop_ref_one;
+delimiter $$
+begin
+if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'DROP_REF_ONE_SEQ') then
+  prepare stmt from 'drop sequence drop_ref_one_seq';
+  execute stmt;
+end if;
+end$$;
 drop table "migtest_QuOtEd";
 drop table migtest_e_ref;
 delimiter $$

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql

@@ -135,6 +135,41 @@ end if;
 end$$;
 delimiter $$
 begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_C_MIGTEST_MTM_M_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_C_MIGTEST_MTM_M') then
+  prepare stmt from 'alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_M' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_MIGTEST_MTM_C_MIGTEST_MTM_C' and ucase(tabname) = 'MIGTEST_MTM_M_MIGTEST_MTM_C') then
+  prepare stmt from 'alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
+if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_MTM_M_PHONE_NUMBERS_MIGTEST_MTM_M_ID' and ucase(tabname) = 'MIGTEST_MTM_M_PHONE_NUMBERS') then
+  prepare stmt from 'alter table migtest_mtm_m_phone_numbers drop constraint fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id';
+  execute stmt;
+end if;
+end$$;
+delimiter $$
+begin
 if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then
   prepare stmt from 'drop index ix_migtest_e_basic_indextest3';
   execute stmt;

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations

@@ -1,7 +1,7 @@
-2058232717,     1.0__initial.sql
--1450326352,    1.1.sql
--1187336846,    1.2__dropsFor_1.1.sql
-1976888196,     1.3.sql
+1681764655,     1.0__initial.sql
+1259437403,     1.1.sql
+135256939,      1.2__dropsFor_1.1.sql
+1091218936,     1.3.sql
 946163478,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -194,6 +216,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql

@@ -7,5 +7,9 @@ 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;
 -- apply post alter
+drop table if exists drop_main;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop table if exists drop_ref_one;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;

ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations

@@ -1,6 +1,6 @@
--1547037623,    1.0__initial.sql
-253988246,      1.1.sql
-688811494,      1.2__dropsFor_1.1.sql
-509168727,      1.3.sql
+-528359263,     1.0__initial.sql
+-1374084944,    1.1.sql
+-875723380,     1.2__dropsFor_1.1.sql
+-819139044,     1.3.sql
 255653518,      1.4__dropsFor_1.3.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -269,6 +291,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql

@@ -14,6 +14,13 @@ alter table migtest_e_history2_history drop column obsolete_string2;
 -- apply post alter
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.platform.h2.H2HistoryTrigger";
+drop table if exists drop_main;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations

@@ -1,7 +1,7 @@
--1854589550,    1.0__initial.sql
-1979519453,     1.1.sql
-1579867974,     1.2__dropsFor_1.1.sql
--285485598,     1.3.sql
+400361768,      1.0__initial.sql
+1531147865,     1.1.sql
+2123154375,     1.2__dropsFor_1.1.sql
+363782261,      1.3.sql
 -1120611041,    1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql

ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql

@@ -54,6 +54,28 @@ create column table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create column table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create column table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create column table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create column table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create column table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        nvarchar(1),
@@ -275,6 +297,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 -- explicit index "ix_migtest_fk_set_null_one_id" for single column "one_id" of table "migtest_fk_set_null" is not necessary;
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+-- explicit index "ix_drop_main_drop_ref_many_drop_main" for single column "drop_main_id" of table "drop_main_drop_ref_many" is not necessary;
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+-- explicit index "ix_drop_main_drop_ref_many_drop_ref_many" for single column "drop_ref_many_id" of table "drop_main_drop_ref_many" is not necessary;
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+-- explicit index "ix_drop_ref_one_parent_id" for single column "parent_id" of table "drop_ref_one" is not necessary;
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 -- explicit index "ix_migtest_e_basic_eref_id" for single column "eref_id" of table "migtest_e_basic" is not necessary;
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql

@@ -37,6 +37,9 @@ declare exit handler for sql_error_code 397 begin end;
 exec 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status';
 end;
 $$;
+alter table drop_main_drop_ref_many drop constraint  fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint  fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint  fk_drop_ref_one_parent_id;
 delimiter $$
 do
 begin

ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql

@@ -12,5 +12,9 @@ CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string1');
 CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string2');
 -- apply post alter
 alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated;
+drop table drop_main cascade;
+drop table drop_main_drop_ref_many cascade;
+drop table drop_ref_many cascade;
+drop table drop_ref_one cascade;
 drop table "migtest_QuOtEd" cascade;
 drop table migtest_e_ref cascade;

ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql

@@ -62,6 +62,11 @@ declare exit handler for sql_error_code 397 begin end;
 exec 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status';
 end;
 $$;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint  fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint  fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint  fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint  fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint  fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 delimiter $$
 do
 begin

ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations

@@ -1,8 +1,8 @@
 -745347271,     I__create_procs.sql
--2017770851,    1.0__initial.sql
--1727762906,    1.1.sql
-1535221752,     1.2__dropsFor_1.1.sql
--1046661128,    1.3.sql
+-1399184401,    1.0__initial.sql
+-1126493787,    1.1.sql
+-1209748806,    1.2__dropsFor_1.1.sql
+-657475021,     1.3.sql
 1185007986,     1.4__dropsFor_1.3.sql
 1906063401,     R__order_views_hana.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity (start with 1)  not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity (start with 1)  not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity (start with 1)  not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity (start with 1)  not null,
   status                        varchar(1),
@@ -194,6 +216,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql

@@ -7,6 +7,13 @@ 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;
 -- apply post alter
+drop table if exists drop_main;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations

@@ -1,7 +1,7 @@
-1833930558,     1.0__initial.sql
-84224587,       1.1.sql
--848622216,     1.2__dropsFor_1.1.sql
-19356381,       1.3.sql
+617421105,      1.0__initial.sql
+-271408671,     1.1.sql
+1366518530,     1.2__dropsFor_1.1.sql
+1536842100,     1.3.sql
 1661935263,     1.4__dropsFor_1.3.sql
 861001272,      R__order_views_hsqldb.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -195,6 +217,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql

@@ -4,6 +4,9 @@ alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop foreign key fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
 drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql

@@ -9,6 +9,13 @@ 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;
 -- apply post alter
+drop table if exists drop_main;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists `migtest_QuOtEd`;
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql

@@ -11,6 +11,11 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop foreign key fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
 drop index ix_table_textfield2 on `table`;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations

@@ -1,7 +1,7 @@
--2111548334,    1.0__initial.sql
--1101751768,    1.1.sql
-919151678,      1.2__dropsFor_1.1.sql
--1572621686,    1.3.sql
+-1588268581,    1.0__initial.sql
+993683171,      1.1.sql
+-799907262,     1.2__dropsFor_1.1.sql
+-797191406,     1.3.sql
 1686135364,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -195,6 +217,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql

@@ -4,6 +4,9 @@ alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop foreign key fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
 drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql

@@ -9,6 +9,13 @@ CALL usp_ebean_drop_column('migtest_e_basic', 'eref_id');
 CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string1');
 CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2');
 -- apply post alter
+drop table if exists drop_main;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists `migtest_QuOtEd`;
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql

@@ -11,6 +11,11 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop foreign key fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
 drop index ix_table_textfield2 on `table`;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations

@@ -1,8 +1,8 @@
 -1933396282,    I__create_procs.sql
--2111548334,    1.0__initial.sql
--1101751768,    1.1.sql
-1187950993,     1.2__dropsFor_1.1.sql
--1572621686,    1.3.sql
+-1588268581,    1.0__initial.sql
+993683171,      1.1.sql
+1653772183,     1.2__dropsFor_1.1.sql
+-797191406,     1.3.sql
 772508824,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml

@@ -37,6 +37,22 @@
             <column name="id" type="bigint" primaryKey="true"/>
             <column name="one_id" type="bigint" references="migtest_fk_one.id" foreignKeyName="fk_migtest_fk_set_null_one_id" foreignKeyIndex="ix_migtest_fk_set_null_one_id" foreignKeyOnDelete="SET_NULL" foreignKeyOnUpdate="RESTRICT"/>
         </createTable>
+        <createTable name="drop_main" pkName="pk_drop_main">
+            <column name="id" type="integer" primaryKey="true"/>
+        </createTable>
+        <createTable name="drop_main_drop_ref_many" pkName="pk_drop_main_drop_ref_many">
+            <column name="drop_main_id" type="integer" notnull="true" primaryKey="true"/>
+            <column name="drop_ref_many_id" type="integer" notnull="true" primaryKey="true"/>
+            <foreignKey name="fk_drop_main_drop_ref_many_drop_main" columnNames="drop_main_id" refColumnNames="id" refTableName="drop_main" indexName="ix_drop_main_drop_ref_many_drop_main"/>
+            <foreignKey name="fk_drop_main_drop_ref_many_drop_ref_many" columnNames="drop_ref_many_id" refColumnNames="id" refTableName="drop_ref_many" indexName="ix_drop_main_drop_ref_many_drop_ref_many"/>
+        </createTable>
+        <createTable name="drop_ref_many" pkName="pk_drop_ref_many">
+            <column name="id" type="integer" primaryKey="true"/>
+        </createTable>
+        <createTable name="drop_ref_one" pkName="pk_drop_ref_one">
+            <column name="id" type="integer" primaryKey="true"/>
+            <column name="parent_id" type="integer" references="drop_main.id" foreignKeyName="fk_drop_ref_one_parent_id" foreignKeyIndex="ix_drop_ref_one_parent_id"/>
+        </createTable>
         <createTable name="migtest_e_basic" pkName="pk_migtest_e_basic" tablespace="db2;TSTABLES;" indexTablespace="db2;INDEXTS;" lobTablespace="db2;TSTABLES;">
             <column name="id" type="integer" primaryKey="true"/>
             <column name="status" type="varchar(1)" checkConstraint="check ( status in ('N','A','I'))" checkConstraintName="ck_migtest_e_basic_status"/>

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml

@@ -103,6 +103,9 @@
         <addColumn tableName="migtest_oto_child">
             <column name="master_id" type="bigint" uniqueOneToOne="uq_migtest_oto_child_master_id" references="migtest_oto_master.id" foreignKeyName="fk_migtest_oto_child_master_id"/>
         </addColumn>
+        <alterForeignKey name="fk_drop_main_drop_ref_many_drop_main" columnNames="DROP FOREIGN KEY" indexName="ix_drop_main_drop_ref_many_drop_main" tableName="drop_main_drop_ref_many"/>
+        <alterForeignKey name="fk_drop_main_drop_ref_many_drop_ref_many" columnNames="DROP FOREIGN KEY" indexName="ix_drop_main_drop_ref_many_drop_ref_many" tableName="drop_main_drop_ref_many"/>
+        <alterForeignKey name="fk_drop_ref_one_parent_id" columnNames="DROP FOREIGN KEY" indexName="ix_drop_ref_one_parent_id" tableName="drop_ref_one"/>
         <createIndex indexName="ix_migtest_e_basic_indextest3" tableName="migtest_e_basic" columns="indextest3"/>
         <createIndex indexName="ix_migtest_e_basic_indextest6" tableName="migtest_e_basic" columns="indextest6"/>
         <createIndex indexName="ix_table_textfield2" tableName="&quot;table&quot;" columns="textfield2"/>
@@ -121,6 +124,10 @@
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
         <dropColumn columnName="obsolete_string1" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="obsolete_string2" tableName="migtest_e_history2" withHistory="true"/>
+        <dropTable name="drop_main" sequenceCol="id"/>
+        <dropTable name="drop_main_drop_ref_many"/>
+        <dropTable name="drop_ref_many" sequenceCol="id"/>
+        <dropTable name="drop_ref_one" sequenceCol="id"/>
         <dropTable name="&quot;migtest_QuOtEd&quot;"/>
         <dropTable name="migtest_e_ref" sequenceCol="id"/>
     </changeSet>

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml

@@ -7,6 +7,10 @@
         <dropColumn columnName="eref_id" tableName="migtest_e_basic"/>
         <dropColumn columnName="obsolete_string1" tableName="migtest_e_history2" withHistory="true"/>
         <dropColumn columnName="obsolete_string2" tableName="migtest_e_history2" withHistory="true"/>
+        <dropTable name="drop_main" sequenceCol="id"/>
+        <dropTable name="drop_main_drop_ref_many"/>
+        <dropTable name="drop_ref_many" sequenceCol="id"/>
+        <dropTable name="drop_ref_one" sequenceCol="id"/>
         <dropTable name="&quot;migtest_QuOtEd&quot;"/>
         <dropTable name="migtest_e_ref" sequenceCol="id"/>
     </changeSet>

ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml

@@ -51,6 +51,11 @@
         <alterTable name="migtest_mtm_m" tablespace="$TABLESPACE_DEFAULT" indexTablespace="$TABLESPACE_DEFAULT" lobTablespace="$TABLESPACE_DEFAULT"/>
         <addUniqueConstraint constraintName="uq_m12_otoc72" tableName="migtest_oto_child" columnNames="name" oneToOne="false" nullableColumns="name" platforms="MYSQL"/>
         <addUniqueConstraint constraintName="uq_migtest_oto_master_name" tableName="migtest_oto_master" columnNames="name" oneToOne="false" nullableColumns="name" platforms="MYSQL"/>
+        <alterForeignKey name="fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c" tableName="migtest_mtm_c_migtest_mtm_m"/>
+        <alterForeignKey name="fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m" tableName="migtest_mtm_c_migtest_mtm_m"/>
+        <alterForeignKey name="fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m" tableName="migtest_mtm_m_migtest_mtm_c"/>
+        <alterForeignKey name="fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c" tableName="migtest_mtm_m_migtest_mtm_c"/>
+        <alterForeignKey name="fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id" columnNames="DROP FOREIGN KEY" indexName="ix_migtest_mtm_m_phone_numbers_migtest_mtm_m_id" tableName="migtest_mtm_m_phone_numbers"/>
         <createIndex indexName="ix_migtest_e_basic_indextest1" tableName="migtest_e_basic" columns="indextest1"/>
         <createIndex indexName="ix_migtest_e_basic_indextest5" tableName="migtest_e_basic" columns="indextest5"/>
         <createIndex indexName="ix_migtest_quoted_status1" tableName="&quot;migtest_QuOtEd&quot;" columns="status1"/>

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -323,6 +345,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql

@@ -4,6 +4,9 @@ alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop foreign key fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
 drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql

@@ -25,5 +25,9 @@ create trigger migtest_e_history2_history_del before delete on migtest_e_history
     insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
 end$$
 unlock tables;
+drop table if exists drop_main;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop table if exists drop_ref_one;
 drop table if exists `migtest_QuOtEd`;
 drop table if exists migtest_e_ref;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql

@@ -11,6 +11,11 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop foreign key fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
 drop index ix_table_textfield2 on `table`;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations

@@ -1,8 +1,8 @@
 -1933396282,    I__create_procs.sql
-1980830787,     1.0__initial.sql
--92753611,      1.1.sql
--1097227916,    1.2__dropsFor_1.1.sql
-1674664705,     1.3.sql
+-1156696445,    1.0__initial.sql
+-1306874760,    1.1.sql
+-70834029,      1.2__dropsFor_1.1.sql
+514784474,      1.3.sql
 -1282113429,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer auto_increment not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer auto_increment not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer auto_increment not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer auto_increment not null,
   status                        varchar(1),
@@ -323,6 +345,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql

@@ -4,6 +4,9 @@ alter table migtest_fk_cascade drop foreign key fk_migtest_fk_cascade_one_id;
 alter table migtest_fk_set_null drop foreign key fk_migtest_fk_set_null_one_id;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop foreign key fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop foreign key fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest5 on migtest_e_basic;
 drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql

@@ -25,5 +25,9 @@ create trigger migtest_e_history2_history_del before delete on migtest_e_history
     insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column);
 end$$
 unlock tables;
+drop table if exists drop_main;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop table if exists drop_ref_one;
 drop table if exists `migtest_QuOtEd`;
 drop table if exists migtest_e_ref;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql

@@ -11,6 +11,11 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_status_indextest1;
 alter table migtest_e_basic drop index uq_migtest_e_basic_name;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop foreign key fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop foreign key fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop foreign key fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index ix_migtest_e_basic_indextest3 on migtest_e_basic;
 drop index ix_migtest_e_basic_indextest6 on migtest_e_basic;
 drop index ix_table_textfield2 on `table`;

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations

@@ -1,8 +1,8 @@
 -1933396282,    I__create_procs.sql
-369577572,      1.0__initial.sql
--92753611,      1.1.sql
--1097227916,    1.2__dropsFor_1.1.sql
-1674664705,     1.3.sql
+-165038024,     1.0__initial.sql
+-1306874760,    1.1.sql
+-70834029,      1.2__dropsFor_1.1.sql
+514784474,      1.3.sql
 -1282113429,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   status                        varchar(1),
@@ -340,6 +362,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id);
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id);
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id);
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id);
+
 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);
 

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
+alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_main;
+alter table drop_main_drop_ref_many drop constraint fk_drop_main_drop_ref_many_drop_ref_many;
+alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql

@@ -27,6 +27,13 @@ create or replace trigger migtest_e_history2_history_del for migtest_e_history2
 end_trigger;
 $$
 
+drop table if exists drop_main;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many;
+drop table if exists drop_ref_many;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd";
 drop table if exists migtest_e_ref;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table migtest_mtm_m_phone_numbers drop constraint fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations

@@ -1,7 +1,7 @@
-390216918,      1.0__initial.sql
--2079708895,    1.1.sql
-1530685455,     1.2__dropsFor_1.1.sql
-73983167,       1.3.sql
+-588780599,     1.0__initial.sql
+1864060880,     1.1.sql
+-1061962041,    1.2__dropsFor_1.1.sql
+-1346387712,    1.3.sql
 -1118858496,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            number(10) generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  number(10) not null,
+  drop_ref_many_id              number(10) not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            number(10) generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            number(10) generated by default as identity not null,
+  parent_id                     number(10),
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            number(10) generated by default as identity not null,
   status                        varchar2(1),
@@ -194,6 +216,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 
+create index ix_drp_mn_drp_rf_mny_drp_mn on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drp_mn_drp_rf_mny_drp_mn foreign key (drop_main_id) references drop_main (id);
+
+create index ix_drp_mn_drp_rf_mny_dr_d70vl on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drp_mn_drp_rf_mny_dr_joeslj foreign key (drop_ref_many_id) references drop_ref_many (id);
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id);
+
 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);
 

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql

@@ -52,6 +52,9 @@ exception
   when expected_error then null;
 end;
 $$;
+alter table drop_main_drop_ref_many drop constraint fk_drp_mn_drp_rf_mny_drp_mn;
+alter table drop_main_drop_ref_many drop constraint fk_drp_mn_drp_rf_mny_dr_joeslj;
+alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1;
 drop index ix_migtest_e_basic_indextest5;
 drop index ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql

@@ -7,6 +7,40 @@ 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;
 -- apply post alter
+drop table drop_main cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_main_seq';
+exception
+  when expected_error then null;
+end;
+$$;
+drop table drop_main_drop_ref_many cascade constraints purge;
+drop table drop_ref_many cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_ref_many_seq';
+exception
+  when expected_error then null;
+end;
+$$;
+drop table drop_ref_one cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_ref_one_seq';
+exception
+  when expected_error then null;
+end;
+$$;
 drop table "migtest_QuOtEd" cascade constraints purge;
 drop table migtest_e_ref cascade constraints purge;
 delimiter $$

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql

@@ -86,6 +86,11 @@ exception
   when expected_error then null;
 end;
 $$;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_mgtst_mtm_c_mgtst_mt_93awga;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_mgtst_mtm_c_mgtst_mt_93awgk;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_mgtst_mtm_m_mgtst_mt_ggi34k;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_mgtst_mtm_m_mgtst_mt_ggi34a;
+alter table migtest_mtm_m_phone_numbers drop constraint fk_mgtst_mtm_m_phn_nmbr_s8neid;
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
 drop index ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations

@@ -1,7 +1,7 @@
-1757923548,     1.0__initial.sql
-740264587,      1.1.sql
-930172034,      1.2__dropsFor_1.1.sql
--1896525025,    1.3.sql
+-126940583,     1.0__initial.sql
+1459805204,     1.1.sql
+1164021503,     1.2__dropsFor_1.1.sql
+1644022208,     1.3.sql
 2037899598,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql

@@ -62,6 +62,31 @@ create table migtest_fk_set_null (
 );
 create sequence migtest_fk_set_null_seq;
 
+create table drop_main (
+  id                            number(10) not null,
+  constraint pk_drop_main primary key (id)
+);
+create sequence drop_main_seq;
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  number(10) not null,
+  drop_ref_many_id              number(10) not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            number(10) not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+create sequence drop_ref_many_seq;
+
+create table drop_ref_one (
+  id                            number(10) not null,
+  parent_id                     number(10),
+  constraint pk_drop_ref_one primary key (id)
+);
+create sequence drop_ref_one_seq;
+
 create table migtest_e_basic (
   id                            number(10) not null,
   status                        varchar2(1),
@@ -216,6 +241,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null;
 
+create index ix_drp_mn_drp_rf_mny_drp_mn on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drp_mn_drp_rf_mny_drp_mn foreign key (drop_main_id) references drop_main (id);
+
+create index ix_drp_mn_drp_rf_mny_dr_d70vl on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drp_mn_drp_rf_mny_dr_joeslj foreign key (drop_ref_many_id) references drop_ref_many (id);
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id);
+
 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);
 

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql

@@ -52,6 +52,9 @@ exception
   when expected_error then null;
 end;
 $$;
+alter table drop_main_drop_ref_many drop constraint fk_drp_mn_drp_rf_mny_drp_mn;
+alter table drop_main_drop_ref_many drop constraint fk_drp_mn_drp_rf_mny_dr_joeslj;
+alter table drop_ref_one drop constraint fk_drop_ref_one_parent_id;
 drop index ix_migtest_e_basic_indextest1;
 drop index ix_migtest_e_basic_indextest5;
 drop index ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql

@@ -7,6 +7,40 @@ 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;
 -- apply post alter
+drop table drop_main cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_main_seq';
+exception
+  when expected_error then null;
+end;
+$$;
+drop table drop_main_drop_ref_many cascade constraints purge;
+drop table drop_ref_many cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_ref_many_seq';
+exception
+  when expected_error then null;
+end;
+$$;
+drop table drop_ref_one cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence drop_ref_one_seq';
+exception
+  when expected_error then null;
+end;
+$$;
 drop table "migtest_QuOtEd" cascade constraints purge;
 drop table migtest_e_ref cascade constraints purge;
 delimiter $$

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql

@@ -86,6 +86,11 @@ exception
   when expected_error then null;
 end;
 $$;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_mgtst_mtm_c_mgtst_mt_93awga;
+alter table migtest_mtm_c_migtest_mtm_m drop constraint fk_mgtst_mtm_c_mgtst_mt_93awgk;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_mgtst_mtm_m_mgtst_mt_ggi34k;
+alter table migtest_mtm_m_migtest_mtm_c drop constraint fk_mgtst_mtm_m_mgtst_mt_ggi34a;
+alter table migtest_mtm_m_phone_numbers drop constraint fk_mgtst_mtm_m_phn_nmbr_s8neid;
 drop index ix_migtest_e_basic_indextest3;
 drop index ix_migtest_e_basic_indextest6;
 drop index ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations

@@ -1,7 +1,7 @@
--1422254768,    1.0__initial.sql
--123689547,     1.1.sql
-930172034,      1.2__dropsFor_1.1.sql
-1967473644,     1.3.sql
+21261569,       1.0__initial.sql
+-1938703172,    1.1.sql
+1164021503,     1.2__dropsFor_1.1.sql
+1673954355,     1.3.sql
 2037899598,     1.4__dropsFor_1.3.sql
 1357801733,     R__oracle_only_views.sql
 561281075,      R__order_views.sql

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            integer generated by default as identity not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            integer generated by default as identity not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            integer generated by default as identity not null,
   description_file              bytea,
@@ -352,6 +374,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table if exists drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql

@@ -37,6 +37,13 @@ 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();
 
+drop table if exists drop_main cascade;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many cascade;
+drop table if exists drop_ref_many cascade;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one cascade;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd" cascade;
 drop table if exists migtest_e_ref cascade;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table if exists migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations

@@ -1,7 +1,7 @@
--769462329,     1.0__initial.sql
-409812555,      1.1.sql
--261111052,     1.2__dropsFor_1.1.sql
-1214144459,     1.3.sql
+-73982981,      1.0__initial.sql
+-1076179036,    1.1.sql
+274267648,      1.2__dropsFor_1.1.sql
+-634032267,     1.3.sql
 -709144111,     1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql

ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql

@@ -54,6 +54,28 @@ create table migtest_fk_set_null (
   constraint pk_migtest_fk_set_null primary key (id)
 );
 
+create table drop_main (
+  id                            serial not null,
+  constraint pk_drop_main primary key (id)
+);
+
+create table drop_main_drop_ref_many (
+  drop_main_id                  integer not null,
+  drop_ref_many_id              integer not null,
+  constraint pk_drop_main_drop_ref_many primary key (drop_main_id,drop_ref_many_id)
+);
+
+create table drop_ref_many (
+  id                            serial not null,
+  constraint pk_drop_ref_many primary key (id)
+);
+
+create table drop_ref_one (
+  id                            serial not null,
+  parent_id                     integer,
+  constraint pk_drop_ref_one primary key (id)
+);
+
 create table migtest_e_basic (
   id                            serial not null,
   description_file              bytea,
@@ -352,6 +374,15 @@ alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id forei
 create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id);
 alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null on update restrict;
 
+create index ix_drop_main_drop_ref_many_drop_main on drop_main_drop_ref_many (drop_main_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_main foreign key (drop_main_id) references drop_main (id) on delete restrict on update restrict;
+
+create index ix_drop_main_drop_ref_many_drop_ref_many on drop_main_drop_ref_many (drop_ref_many_id);
+alter table drop_main_drop_ref_many add constraint fk_drop_main_drop_ref_many_drop_ref_many foreign key (drop_ref_many_id) references drop_ref_many (id) on delete restrict on update restrict;
+
+create index ix_drop_ref_one_parent_id on drop_ref_one (parent_id);
+alter table drop_ref_one add constraint fk_drop_ref_one_parent_id foreign key (parent_id) references drop_main (id) on delete restrict on update restrict;
+
 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;
 

ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql

@@ -7,6 +7,9 @@ alter table migtest_e_basic drop constraint if exists ck_migtest_e_basic_status2
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_main;
+alter table if exists drop_main_drop_ref_many drop constraint if exists fk_drop_main_drop_ref_many_drop_ref_many;
+alter table if exists drop_ref_one drop constraint if exists fk_drop_ref_one_parent_id;
 drop index if exists ix_migtest_e_basic_indextest1;
 drop index if exists ix_migtest_e_basic_indextest5;
 drop index if exists ix_migtest_quoted_status1;

ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql

@@ -37,6 +37,13 @@ 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();
 
+drop table if exists drop_main cascade;
+drop sequence if exists drop_main_seq;
+drop table if exists drop_main_drop_ref_many cascade;
+drop table if exists drop_ref_many cascade;
+drop sequence if exists drop_ref_many_seq;
+drop table if exists drop_ref_one cascade;
+drop sequence if exists drop_ref_one_seq;
 drop table if exists "migtest_QuOtEd" cascade;
 drop table if exists migtest_e_ref cascade;
 drop sequence if exists migtest_e_ref_seq;

ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql

@@ -14,6 +14,11 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_name;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4;
 alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5;
 alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c;
+alter table if exists migtest_mtm_c_migtest_mtm_m drop constraint if exists fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m;
+alter table if exists migtest_mtm_m_migtest_mtm_c drop constraint if exists fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c;
+alter table if exists migtest_mtm_m_phone_numbers drop constraint if exists fk_migtest_mtm_m_phone_numbers_migtest_mtm_m_id;
 drop index if exists ix_migtest_e_basic_indextest3;
 drop index if exists ix_migtest_e_basic_indextest6;
 drop index if exists ix_table_textfield2;