updated scripts

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

@@ -4,9 +4,10 @@ create table migtest_e_history7 (
   id                            integer generated by default as identity not null,
   constraint pk_migtest_e_history7 primary key (id)
 );
+
+-- apply alter tables
 alter table migtest_e_history7 add column sys_period_start timestamp default now();
 alter table migtest_e_history7 add column sys_period_end timestamp;
-
 -- apply post alter
 create table migtest_e_history7_history(
   id                            integer,

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

@@ -162,9 +162,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -175,3 +172,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -83,8 +83,6 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1
 alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -112,3 +110,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ 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 migtest_e_ref cascade;
+drop sequence if exists migtest_e_ref_seq;

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

@@ -58,11 +58,11 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( st
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user cascade;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
 drop table if exists migtest_mtm_m_migtest_mtm_c cascade;
 drop table if exists migtest_mtm_m_phone_numbers cascade;

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

@@ -1,7 +1,7 @@
-1878005982,     1.0__initial.sql
--1761478813,    1.1.sql
-28732175,       1.2__dropsFor_1.1.sql
-1618620048,     1.3.sql
-1999778259,     1.4__dropsFor_1.3.sql
+246318791,      1.0__initial.sql
+1109849447,     1.1.sql
+240919209,      1.2__dropsFor_1.1.sql
+612721597,      1.3.sql
+-820814009,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -163,8 +163,6 @@ create table migtest_oto_master (
 create unique index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) exclude null keys;
 create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -175,3 +173,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -86,8 +86,6 @@ create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4)
 create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
@@ -115,3 +113,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
 -- apply post alter
 drop table migtest_e_ref;
+drop sequence migtest_e_ref_seq;

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

@@ -60,11 +60,11 @@ create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6)
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user;
+drop sequence migtest_e_user_seq;
 drop table migtest_mtm_c_migtest_mtm_m;
 drop table migtest_mtm_m_migtest_mtm_c;
 drop table migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
-579518381,      1.0__initial.sql
-6421452,        1.1.sql
-1337198247,     1.2__dropsFor_1.1.sql
--1403790229,    1.3.sql
--1778697851,    1.4__dropsFor_1.3.sql
+101990988,      1.0__initial.sql
+1882152352,     1.1.sql
+-2081356955,    1.2__dropsFor_1.1.sql
+-1397487290,    1.3.sql
+-1610622815,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -163,8 +163,6 @@ create table migtest_oto_master (
 create unique index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) exclude null keys;
 create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) exclude null keys;
 alter table migtest_e_ref add constraint uq_mgtst__rf_nm unique  (name);
-create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
-create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_mgtst_fk_mok1xj on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -175,3 +173,5 @@ alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (o
 create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 
+create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
+create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);

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

@@ -86,8 +86,6 @@ create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4)
 create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_mgtst__b_eu8css on migtest_e_basic (indextest3);
-create index ix_mgtst__b_eu8csv on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
@@ -115,3 +113,5 @@ alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (o
 alter table migtest_e_basic add constraint fk_mgtst__bsc_sr_d foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_oto_child add constraint fk_mgtst_t__csyl38 foreign key (master_id) references migtest_oto_master (id) on delete restrict;
 
+create index ix_mgtst__b_eu8css on migtest_e_basic (indextest3);
+create index ix_mgtst__b_eu8csv on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
 -- apply post alter
 drop table migtest_e_ref;
+drop sequence migtest_e_ref_seq;

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

@@ -60,11 +60,11 @@ create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6)
 alter table migtest_e_enum add constraint ck_mgtst__n_773sok check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
-create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null;
 create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict;
 
+create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1);
+create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user;
+drop sequence migtest_e_user_seq;
 drop table migtest_mtm_c_migtest_mtm_m;
 drop table migtest_mtm_m_migtest_mtm_c;
 drop table migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
--1323401755,    1.0__initial.sql
--1188471856,    1.1.sql
-1337198247,     1.2__dropsFor_1.1.sql
--1336058490,    1.3.sql
--1778697851,    1.4__dropsFor_1.3.sql
+1364985791,     1.0__initial.sql
+1265418767,     1.1.sql
+-2081356955,    1.2__dropsFor_1.1.sql
+-46810481,      1.3.sql
+-1610622815,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -163,8 +163,6 @@ create table migtest_oto_master (
 create unique index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) exclude null keys;
 create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -175,3 +173,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -86,8 +86,6 @@ create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4)
 create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
@@ -115,3 +113,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
 -- apply post alter
 drop table migtest_e_ref;
+drop sequence migtest_e_ref_seq;

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

@@ -60,11 +60,11 @@ create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6)
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user;
+drop sequence migtest_e_user_seq;
 drop table migtest_mtm_c_migtest_mtm_m;
 drop table migtest_mtm_m_migtest_mtm_c;
 drop table migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
-377550917,      1.0__initial.sql
--1004566762,    1.1.sql
-1337198247,     1.2__dropsFor_1.1.sql
--996351148,     1.3.sql
--1778697851,    1.4__dropsFor_1.3.sql
+840828324,      1.0__initial.sql
+-1269751430,    1.1.sql
+-2081356955,    1.2__dropsFor_1.1.sql
+-998558087,     1.3.sql
+-1610622815,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -163,8 +163,6 @@ create table migtest_oto_master (
 create unique index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) exclude null keys;
 create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) exclude null keys;
 alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique  (name);
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -175,3 +173,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -86,8 +86,6 @@ create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4)
 create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys;
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict;
@@ -115,3 +113,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ alter table migtest_e_history2 drop column obsolete_string1;
 alter table migtest_e_history2 drop column obsolete_string2;
 -- apply post alter
 drop table migtest_e_ref;
+drop sequence migtest_e_ref_seq;

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

@@ -60,11 +60,11 @@ create unique index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6)
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user;
+drop sequence migtest_e_user_seq;
 drop table migtest_mtm_c_migtest_mtm_m;
 drop table migtest_mtm_m_migtest_mtm_c;
 drop table migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
-377550917,      1.0__initial.sql
--1004566762,    1.1.sql
-1337198247,     1.2__dropsFor_1.1.sql
--996351148,     1.3.sql
--1778697851,    1.4__dropsFor_1.3.sql
+840828324,      1.0__initial.sql
+-1269751430,    1.1.sql
+-2081356955,    1.2__dropsFor_1.1.sql
+-998558087,     1.3.sql
+-1610622815,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -162,9 +162,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -175,3 +172,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -85,8 +85,6 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -114,3 +112,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -60,11 +60,11 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -1,6 +1,6 @@
--1019203661,    1.0__initial.sql
-523189619,      1.1.sql
+-1254950549,    1.0__initial.sql
+-905429129,     1.1.sql
 1279151426,     1.2__dropsFor_1.1.sql
-1114563224,     1.3.sql
+110210997,      1.3.sql
 80209848,       1.4__dropsFor_1.3.sql
 

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

@@ -99,32 +99,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period_start timestamp default now();
-alter table migtest_e_history2 add column sys_period_end timestamp;
 
 create table migtest_e_history3 (
   id                            integer generated by default as identity not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period_start timestamp default now();
-alter table migtest_e_history3 add column sys_period_end timestamp;
 
 create table migtest_e_history4 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period_start timestamp default now();
-alter table migtest_e_history4 add column sys_period_end timestamp;
 
 create table migtest_e_history5 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period_start timestamp default now();
-alter table migtest_e_history5 add column sys_period_end timestamp;
 
 create table migtest_e_history6 (
   id                            integer generated by default as identity not null,
@@ -132,8 +124,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period_start timestamp default now();
-alter table migtest_e_history6 add column sys_period_end timestamp;
 
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
@@ -172,6 +162,17 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period_start timestamp default now();
+alter table migtest_e_history2 add column sys_period_end timestamp;
+alter table migtest_e_history3 add column sys_period_start timestamp default now();
+alter table migtest_e_history3 add column sys_period_end timestamp;
+alter table migtest_e_history4 add column sys_period_start timestamp default now();
+alter table migtest_e_history4 add column sys_period_end timestamp;
+alter table migtest_e_history5 add column sys_period_start timestamp default now();
+alter table migtest_e_history5 add column sys_period_end timestamp;
+alter table migtest_e_history6 add column sys_period_start timestamp default now();
+alter table migtest_e_history6 add column sys_period_end timestamp;
 -- apply post alter
 create table migtest_e_history2_history(
   id                            integer,
@@ -216,8 +217,6 @@ create table migtest_e_history6_history(
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -228,6 +227,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";
 create trigger migtest_e_history3_history_upd before update,delete on migtest_e_history3 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger";

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

@@ -42,8 +42,6 @@ update migtest_e_basic set status = 'A' where status is null;
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_history add column sys_period_start timestamp default now();
-alter table migtest_e_history add column sys_period_end timestamp;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
@@ -65,6 +63,8 @@ alter table migtest_e_basic add column new_boolean_field boolean default true no
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history add column sys_period_start timestamp default now();
+alter table migtest_e_history add column sys_period_end timestamp;
 alter table migtest_e_history alter column test_string bigint;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
@@ -104,8 +104,6 @@ create view migtest_e_history_with_history as select * from migtest_e_history un
 
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -133,6 +131,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -1,8 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -14,6 +12,7 @@ alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
 -- apply post alter
 drop table if exists migtest_e_ref;
+drop sequence if exists migtest_e_ref_seq;
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -66,14 +66,14 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql

@@ -6,8 +6,6 @@ drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -31,6 +29,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
 drop table if exists migtest_mtm_m_phone_numbers;

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

@@ -1,8 +1,8 @@
-235308122,      1.0__initial.sql
--1285933972,    1.1.sql
--97126202,      1.2__dropsFor_1.1.sql
--1371177335,    1.3.sql
--1491167595,    1.4__dropsFor_1.3.sql
+-698689813,     1.0__initial.sql
+2028346373,     1.1.sql
+-2063980912,    1.2__dropsFor_1.1.sql
+-508824171,     1.3.sql
+511468518,      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

@@ -163,9 +163,6 @@ create column table migtest_oto_master (
 );
 
 -- apply alter tables
--- apply post alter
--- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
--- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;
 -- foreign keys and indices
 -- explicit index "ix_migtest_fk_cascade_one_id" for single column "one_id" of table "migtest_fk_cascade" is not necessary;
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -176,6 +173,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 -- 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;
 
+-- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;
 -- apply history view
 create column table migtest_e_history2_history (
  id integer,

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

@@ -140,8 +140,6 @@ alter table migtest_e_history3 add system versioning history table migtest_e_his
 alter table migtest_e_history4 add system versioning history table migtest_e_history4_history not validated;
 alter table migtest_e_history5 add system versioning history table migtest_e_history5_history not validated;
 alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated;
--- explicit index "ix_migtest_e_basic_indextest3" for single column "indextest3" of table "migtest_e_basic" is not necessary;
--- explicit index "ix_migtest_e_basic_indextest6" for single column "indextest6" of table "migtest_e_basic" is not necessary;
 -- foreign keys and indices
 -- explicit index "ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c" for single column "migtest_mtm_c_id" of table "migtest_mtm_c_migtest_mtm_m" is not necessary;
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -169,6 +167,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+-- explicit index "ix_migtest_e_basic_indextest3" for single column "indextest3" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest6" for single column "indextest6" of table "migtest_e_basic" is not necessary;
 -- apply history view
 create column table migtest_e_history_history (
  id integer,

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

@@ -130,11 +130,11 @@ alter table migtest_e_history2 add system versioning history table migtest_e_his
 alter table migtest_e_history3 add system versioning history table migtest_e_history3_history not validated;
 alter table migtest_e_history4 add system versioning history table migtest_e_history4_history not validated;
 alter table migtest_e_history6 add system versioning history table migtest_e_history6_history not validated;
--- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
--- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_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;
 
+-- explicit index "ix_migtest_e_basic_indextest1" for single column "indextest1" of table "migtest_e_basic" is not necessary;
+-- explicit index "ix_migtest_e_basic_indextest5" for single column "indextest5" of table "migtest_e_basic" is not necessary;

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

@@ -1,8 +1,8 @@
 -745347271,     I__create_procs.sql
-1110470847,     1.0__initial.sql
--750750591,     1.1.sql
+1671978053,     1.0__initial.sql
+945235204,      1.1.sql
 197547825,      1.2__dropsFor_1.1.sql
-1403985020,     1.3.sql
+1030116997,     1.3.sql
 1812245353,     1.4__dropsFor_1.3.sql
 1906063401,     R__order_views_hana.sql
 

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

@@ -162,9 +162,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -175,3 +172,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -85,8 +85,6 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -114,3 +112,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ 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 migtest_e_ref;
+drop sequence if exists migtest_e_ref_seq;

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

@@ -60,11 +60,11 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
 drop table if exists migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
--287760616,     1.0__initial.sql
-1240370138,     1.1.sql
-1300559201,     1.2__dropsFor_1.1.sql
--1618431338,    1.3.sql
--510002583,     1.4__dropsFor_1.3.sql
+442457363,      1.0__initial.sql
+-1664513570,    1.1.sql
+-300925212,     1.2__dropsFor_1.1.sql
+-612892741,     1.3.sql
+-972999284,     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

@@ -159,9 +159,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -172,6 +169,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history view
 alter table migtest_e_history2 add system versioning;
 alter table migtest_e_history3 add system versioning;

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

@@ -31,38 +31,38 @@ create table migtest_mtm_m_phone_numbers (
 
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic modify status varchar(1) not null default 'A';
-alter table migtest_e_basic modify status2 varchar(127);
 
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic modify user_id integer;
-alter table migtest_e_history modify test_string bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 SET @@system_versioning_alter_history = 1;
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
-alter table migtest_e_history4 modify test_number bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
-alter table migtest_e_history6 modify test_number1 integer not null default 42;
-alter table migtest_e_history6 modify test_number2 integer;
 -- apply alter tables
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
+alter table migtest_e_basic modify status varchar(1) not null default 'A';
+alter table migtest_e_basic modify status2 varchar(127);
+alter table migtest_e_basic modify user_id integer;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add column new_boolean_field tinyint(1) default 1 not null;
 alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history modify test_string bigint;
+alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
+alter table migtest_e_history4 modify test_number bigint;
 alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null;
+alter table migtest_e_history6 modify test_number1 integer not null default 42;
+alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
 -- apply post alter
@@ -75,8 +75,6 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 alter table migtest_e_history comment = 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -104,6 +102,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 alter table migtest_e_history add system versioning;
 -- apply history trigger

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

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -10,3 +8,4 @@ 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 migtest_e_ref;
+drop sequence if exists migtest_e_ref_seq;

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

@@ -21,39 +21,39 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
-alter table migtest_e_basic modify status varchar(1);
 
 update migtest_e_basic set status2 = 'N' where status2 is null;
-alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_basic modify user_id integer not null default 23;
-alter table migtest_e_history2 modify test_string varchar(255);
-alter table migtest_e_history4 modify test_number integer;
-alter table migtest_e_history6 modify test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
-alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply alter tables
+alter table migtest_e_basic modify status varchar(1);
+alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
+alter table migtest_e_basic modify user_id integer not null default 23;
 alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
+alter table migtest_e_history2 modify test_string varchar(255);
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+alter table migtest_e_history4 modify test_number integer;
+alter table migtest_e_history6 modify test_number1 integer;
+alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 lock tables migtest_e_history3 write;
 unlock tables;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.4__dropsFor_1.3.sql

@@ -1,6 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -18,6 +16,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
 drop table if exists migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
--236478024,     1.0__initial.sql
-1650543949,     1.1.sql
-1300559201,     1.2__dropsFor_1.1.sql
--1408500849,    1.3.sql
--1110228228,    1.4__dropsFor_1.3.sql
+2035483098,     1.0__initial.sql
+-924429039,     1.1.sql
+-300925212,     1.2__dropsFor_1.1.sql
+-773358828,     1.3.sql
+-1978922691,    1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -159,9 +159,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -172,6 +169,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history view
 alter table migtest_e_history2 add system versioning;
 alter table migtest_e_history3 add system versioning;

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

@@ -31,38 +31,38 @@ create table migtest_mtm_m_phone_numbers (
 
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic modify status varchar(1) not null default 'A';
-alter table migtest_e_basic modify status2 varchar(127);
 
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic modify user_id integer;
-alter table migtest_e_history modify test_string bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 SET @@system_versioning_alter_history = 1;
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
-alter table migtest_e_history4 modify test_number bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
-alter table migtest_e_history6 modify test_number1 integer not null default 42;
-alter table migtest_e_history6 modify test_number2 integer;
 -- apply alter tables
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
+alter table migtest_e_basic modify status varchar(1) not null default 'A';
+alter table migtest_e_basic modify status2 varchar(127);
+alter table migtest_e_basic modify user_id integer;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add column new_boolean_field tinyint(1) default 1 not null;
 alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history modify test_string bigint;
+alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
+alter table migtest_e_history4 modify test_number bigint;
 alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null;
+alter table migtest_e_history6 modify test_number1 integer not null default 42;
+alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
 -- apply post alter
@@ -75,8 +75,6 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique  (name
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique  (indextest4);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 alter table migtest_e_history comment = 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -104,6 +102,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 alter table migtest_e_history add system versioning;
 -- apply history trigger

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

@@ -1,11 +1,11 @@
 -- Migrationscripts for ebean unittest
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
 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');
-drop sequence if exists migtest_e_ref_seq;
 -- apply post alter
 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

@@ -21,39 +21,39 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
-alter table migtest_e_basic modify status varchar(1);
 
 update migtest_e_basic set status2 = 'N' where status2 is null;
-alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_basic modify user_id integer not null default 23;
-alter table migtest_e_history2 modify test_string varchar(255);
-alter table migtest_e_history4 modify test_number integer;
-alter table migtest_e_history6 modify test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
-alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply alter tables
+alter table migtest_e_basic modify status varchar(1);
+alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
+alter table migtest_e_basic modify user_id integer not null default 23;
 alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
+alter table migtest_e_history2 modify test_string varchar(255);
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
+alter table migtest_e_history4 modify test_number integer;
+alter table migtest_e_history6 modify test_number1 integer;
+alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 lock tables migtest_e_history3 write;
 unlock tables;

ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.4__dropsFor_1.3.sql

@@ -1,5 +1,5 @@
 -- Migrationscripts for ebean unittest
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -14,9 +14,9 @@ CALL usp_ebean_drop_column('migtest_e_history2', 'new_column');
 CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_softdelete', 'deleted');
 CALL usp_ebean_drop_column('migtest_oto_child', 'master_id');
-drop sequence if exists migtest_e_user_seq;
 -- apply post alter
 drop table if exists migtest_e_user;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
 drop table if exists migtest_mtm_m_phone_numbers;

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

@@ -1,8 +1,8 @@
 1835064798,     I__create_procs.sql
--236478024,     1.0__initial.sql
-1650543949,     1.1.sql
--394047497,     1.2__dropsFor_1.1.sql
--1408500849,    1.3.sql
-1479728551,     1.4__dropsFor_1.3.sql
+2035483098,     1.0__initial.sql
+-924429039,     1.1.sql
+-17652545,      1.2__dropsFor_1.1.sql
+-773358828,     1.3.sql
+-171059083,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -96,32 +96,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history2 add column sys_period_end datetime(6);
 
 create table migtest_e_history3 (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history3 add column sys_period_end datetime(6);
 
 create table migtest_e_history4 (
   id                            integer auto_increment not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history4 add column sys_period_end datetime(6);
 
 create table migtest_e_history5 (
   id                            integer auto_increment not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history5 add column sys_period_end datetime(6);
 
 create table migtest_e_history6 (
   id                            integer auto_increment not null,
@@ -129,8 +121,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history6 add column sys_period_end datetime(6);
 
 create table migtest_e_ref (
   id                            integer auto_increment not null,
@@ -169,6 +159,17 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history2 add column sys_period_end datetime(6);
+alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history3 add column sys_period_end datetime(6);
+alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history4 add column sys_period_end datetime(6);
+alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history5 add column sys_period_end datetime(6);
+alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history6 add column sys_period_end datetime(6);
 -- apply post alter
 create table migtest_e_history2_history(
   id                            integer,
@@ -213,8 +214,6 @@ create table migtest_e_history6_history(
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -225,6 +224,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin

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

@@ -35,44 +35,44 @@ create table migtest_mtm_m_phone_numbers (
 
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic modify status varchar(1) not null default 'A';
-alter table migtest_e_basic modify status2 varchar(127);
 
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic modify user_id integer;
-alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history add column sys_period_end datetime(6);
-alter table migtest_e_history modify test_string bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
-alter table migtest_e_history4 modify test_number bigint;
-alter table migtest_e_history4_history modify test_number bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
-alter table migtest_e_history6 modify test_number1 integer not null default 42;
-alter table migtest_e_history6 modify test_number2 integer;
 -- apply alter tables
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
+alter table migtest_e_basic modify status varchar(1) not null default 'A';
+alter table migtest_e_basic modify status2 varchar(127);
+alter table migtest_e_basic modify user_id integer;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add column new_boolean_field tinyint(1) default 1 not null;
 alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history add column sys_period_end datetime(6);
+alter table migtest_e_history modify test_string bigint;
+alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 alter table migtest_e_history2_history add column new_column varchar(20);
+alter table migtest_e_history4 modify test_number bigint;
+alter table migtest_e_history4_history modify test_number bigint;
 alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null;
 alter table migtest_e_history5_history add column test_boolean tinyint(1) default 0;
+alter table migtest_e_history6 modify test_number1 integer not null default 42;
+alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
 -- apply post alter
@@ -93,8 +93,6 @@ create table migtest_e_history_history(
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
 alter table migtest_e_history comment = 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -122,6 +120,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -1,14 +1,14 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
 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_history', 'obsolete_string1');
 CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2');
+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
 drop table if exists migtest_e_ref;

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

@@ -24,46 +24,46 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
-alter table migtest_e_basic modify status varchar(1);
 
 update migtest_e_basic set status2 = 'N' where status2 is null;
-alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_basic modify user_id integer not null default 23;
-alter table migtest_e_history2 modify test_string varchar(255);
-alter table migtest_e_history4 modify test_number integer;
-alter table migtest_e_history4_history modify test_number integer;
-alter table migtest_e_history6 modify test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
-alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply alter tables
+alter table migtest_e_basic modify status varchar(1);
+alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
+alter table migtest_e_basic modify user_id integer not null default 23;
 alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
+alter table migtest_e_history2 modify test_string varchar(255);
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+alter table migtest_e_history4 modify test_number integer;
+alter table migtest_e_history4_history modify test_number integer;
+alter table migtest_e_history6 modify test_number1 integer;
+alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
 alter table migtest_oto_child add constraint uq_m12_otoc72 unique  (name);
 alter table migtest_oto_master add constraint uq_migtest_oto_master_name unique  (name);
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index ix_m12_otoc72 on migtest_oto_child (name);
-create index ix_migtest_oto_master_name on migtest_oto_master (name);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index ix_m12_otoc72 on migtest_oto_child (name);
+create index ix_migtest_oto_master_name on migtest_oto_master (name);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql

@@ -7,7 +7,7 @@ drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -19,10 +19,10 @@ CALL usp_ebean_drop_column('migtest_e_basic', 'new_integer');
 CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_start');
 CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_end');
 CALL usp_ebean_drop_column('migtest_e_history2', 'test_string2');
-CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
 CALL usp_ebean_drop_column('migtest_e_history2', 'test_string3');
-CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
 CALL usp_ebean_drop_column('migtest_e_history2', 'new_column');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
 CALL usp_ebean_drop_column('migtest_e_history2_history', 'new_column');
 CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');

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

@@ -1,8 +1,8 @@
 1835064798,     I__create_procs.sql
-1536043334,     1.0__initial.sql
--67000941,      1.1.sql
--849327648,     1.2__dropsFor_1.1.sql
-1023253480,     1.3.sql
-1322560169,     1.4__dropsFor_1.3.sql
+-1593712798,    1.0__initial.sql
+567923852,      1.1.sql
+434939997,      1.2__dropsFor_1.1.sql
+1523214469,     1.3.sql
+-487286618,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -96,32 +96,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history2 add column sys_period_end datetime(6);
 
 create table migtest_e_history3 (
   id                            integer auto_increment not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history3 add column sys_period_end datetime(6);
 
 create table migtest_e_history4 (
   id                            integer auto_increment not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history4 add column sys_period_end datetime(6);
 
 create table migtest_e_history5 (
   id                            integer auto_increment not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history5 add column sys_period_end datetime(6);
 
 create table migtest_e_history6 (
   id                            integer auto_increment not null,
@@ -129,8 +121,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history6 add column sys_period_end datetime(6);
 
 create table migtest_e_ref (
   id                            integer auto_increment not null,
@@ -169,6 +159,17 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history2 add column sys_period_end datetime(6);
+alter table migtest_e_history3 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history3 add column sys_period_end datetime(6);
+alter table migtest_e_history4 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history4 add column sys_period_end datetime(6);
+alter table migtest_e_history5 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history5 add column sys_period_end datetime(6);
+alter table migtest_e_history6 add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history6 add column sys_period_end datetime(6);
 -- apply post alter
 create table migtest_e_history2_history(
   id                            integer,
@@ -213,8 +214,6 @@ create table migtest_e_history6_history(
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -225,6 +224,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 delimiter $$
 create trigger migtest_e_history2_history_upd before update on migtest_e_history2 for each row begin

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

@@ -35,44 +35,44 @@ create table migtest_mtm_m_phone_numbers (
 
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic modify status varchar(1) not null default 'A';
-alter table migtest_e_basic modify status2 varchar(127);
 
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_basic modify user_id integer;
-alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
-alter table migtest_e_history add column sys_period_end datetime(6);
-alter table migtest_e_history modify test_string bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
-alter table migtest_e_history4 modify test_number bigint;
-alter table migtest_e_history4_history modify test_number bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
-alter table migtest_e_history6 modify test_number1 integer not null default 42;
-alter table migtest_e_history6 modify test_number2 integer;
 -- apply alter tables
 alter table migtest_ckey_detail add column one_key integer;
 alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
+alter table migtest_e_basic modify status varchar(1) not null default 'A';
+alter table migtest_e_basic modify status2 varchar(127);
+alter table migtest_e_basic modify user_id integer;
 alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null;
 alter table migtest_e_basic add column new_boolean_field tinyint(1) default 1 not null;
 alter table migtest_e_basic add column new_boolean_field2 tinyint(1) default 1 not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history add column sys_period_start datetime(6) default now(6);
+alter table migtest_e_history add column sys_period_end datetime(6);
+alter table migtest_e_history modify test_string bigint;
+alter table migtest_e_history2 modify test_string varchar(255) not null default 'unknown';
 alter table migtest_e_history2 add column test_string2 varchar(255);
 alter table migtest_e_history2 add column test_string3 varchar(255) default 'unknown' not null;
 alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 alter table migtest_e_history2_history add column new_column varchar(20);
+alter table migtest_e_history4 modify test_number bigint;
+alter table migtest_e_history4_history modify test_number bigint;
 alter table migtest_e_history5 add column test_boolean tinyint(1) default 0 not null;
 alter table migtest_e_history5_history add column test_boolean tinyint(1) default 0;
+alter table migtest_e_history6 modify test_number1 integer not null default 42;
+alter table migtest_e_history6 modify test_number2 integer;
 alter table migtest_e_softdelete add column deleted tinyint(1) default 0 not null;
 alter table migtest_oto_child add column master_id bigint;
 -- apply post alter
@@ -93,8 +93,6 @@ create table migtest_e_history_history(
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
 alter table migtest_e_history comment = 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -122,6 +120,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -1,14 +1,14 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_e_basic', 'description_file');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean');
 CALL usp_ebean_drop_column('migtest_e_basic', 'old_boolean2');
 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_history', 'obsolete_string1');
 CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2');
+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
 drop table if exists migtest_e_ref;

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

@@ -24,46 +24,46 @@ create table migtest_e_ref (
   constraint pk_migtest_e_ref primary key (id)
 );
 
-alter table migtest_e_basic modify status varchar(1);
 
 update migtest_e_basic set status2 = 'N' where status2 is null;
-alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_basic modify user_id integer not null default 23;
-alter table migtest_e_history2 modify test_string varchar(255);
-alter table migtest_e_history4 modify test_number integer;
-alter table migtest_e_history4_history modify test_number integer;
-alter table migtest_e_history6 modify test_number1 integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
-alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply alter tables
+alter table migtest_e_basic modify status varchar(1);
+alter table migtest_e_basic modify status2 varchar(1) not null default 'N';
+alter table migtest_e_basic modify user_id integer not null default 23;
 alter table migtest_e_basic add column description_file longblob;
 alter table migtest_e_basic add column old_boolean tinyint(1) default 0 not null;
 alter table migtest_e_basic add column old_boolean2 tinyint(1);
 alter table migtest_e_basic add column eref_id integer;
+alter table migtest_e_history2 modify test_string varchar(255);
 alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+alter table migtest_e_history4 modify test_number integer;
+alter table migtest_e_history4_history modify test_number integer;
+alter table migtest_e_history6 modify test_number1 integer;
+alter table migtest_e_history6 modify test_number2 integer not null default 7;
 -- apply post alter
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_history comment = '';
 alter table migtest_oto_child add constraint uq_m12_otoc72 unique  (name);
 alter table migtest_oto_master add constraint uq_migtest_oto_master_name unique  (name);
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index ix_m12_otoc72 on migtest_oto_child (name);
-create index ix_migtest_oto_master_name on migtest_oto_master (name);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index ix_m12_otoc72 on migtest_oto_child (name);
+create index ix_migtest_oto_master_name on migtest_oto_master (name);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql

@@ -7,7 +7,7 @@ drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
--- apply changes
+-- apply alter tables
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'one_key');
 CALL usp_ebean_drop_column('migtest_ckey_detail', 'two_key');
 CALL usp_ebean_drop_column('migtest_ckey_parent', 'assoc_id');
@@ -19,10 +19,10 @@ CALL usp_ebean_drop_column('migtest_e_basic', 'new_integer');
 CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_start');
 CALL usp_ebean_drop_column('migtest_e_history', 'sys_period_end');
 CALL usp_ebean_drop_column('migtest_e_history2', 'test_string2');
-CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
 CALL usp_ebean_drop_column('migtest_e_history2', 'test_string3');
-CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
 CALL usp_ebean_drop_column('migtest_e_history2', 'new_column');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string2');
+CALL usp_ebean_drop_column('migtest_e_history2_history', 'test_string3');
 CALL usp_ebean_drop_column('migtest_e_history2_history', 'new_column');
 CALL usp_ebean_drop_column('migtest_e_history5', 'test_boolean');
 CALL usp_ebean_drop_column('migtest_e_history5_history', 'test_boolean');

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

@@ -1,8 +1,8 @@
 1835064798,     I__create_procs.sql
-1122959299,     1.0__initial.sql
--67000941,      1.1.sql
--849327648,     1.2__dropsFor_1.1.sql
-1023253480,     1.3.sql
-1322560169,     1.4__dropsFor_1.3.sql
+-1722692121,    1.0__initial.sql
+567923852,      1.1.sql
+434939997,      1.2__dropsFor_1.1.sql
+1523214469,     1.3.sql
+-487286618,     1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -99,32 +99,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period_start datetime(6) default now();
-alter table migtest_e_history2 add column sys_period_end datetime(6);
 
 create table migtest_e_history3 (
   id                            integer generated by default as identity not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period_start datetime(6) default now();
-alter table migtest_e_history3 add column sys_period_end datetime(6);
 
 create table migtest_e_history4 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period_start datetime(6) default now();
-alter table migtest_e_history4 add column sys_period_end datetime(6);
 
 create table migtest_e_history5 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period_start datetime(6) default now();
-alter table migtest_e_history5 add column sys_period_end datetime(6);
 
 create table migtest_e_history6 (
   id                            integer generated by default as identity not null,
@@ -132,8 +124,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period_start datetime(6) default now();
-alter table migtest_e_history6 add column sys_period_end datetime(6);
 
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
@@ -172,6 +162,17 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period_start datetime(6) default now();
+alter table migtest_e_history2 add column sys_period_end datetime(6);
+alter table migtest_e_history3 add column sys_period_start datetime(6) default now();
+alter table migtest_e_history3 add column sys_period_end datetime(6);
+alter table migtest_e_history4 add column sys_period_start datetime(6) default now();
+alter table migtest_e_history4 add column sys_period_end datetime(6);
+alter table migtest_e_history5 add column sys_period_start datetime(6) default now();
+alter table migtest_e_history5 add column sys_period_end datetime(6);
+alter table migtest_e_history6 add column sys_period_start datetime(6) default now();
+alter table migtest_e_history6 add column sys_period_end datetime(6);
 -- apply post alter
 create table migtest_e_history2_history(
   id                            integer,
@@ -216,8 +217,6 @@ create table migtest_e_history6_history(
 );
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -228,6 +227,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history trigger
 delimiter $$
 create or replace trigger migtest_e_history2_history_upd for migtest_e_history2 before update for each row as 

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

@@ -42,8 +42,6 @@ update migtest_e_basic set status = 'A' where status is null;
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_history add column sys_period_start datetime(6) default now();
-alter table migtest_e_history add column sys_period_end datetime(6);
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
@@ -65,6 +63,8 @@ alter table migtest_e_basic add column new_boolean_field boolean default true no
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history add column sys_period_start datetime(6) default now();
+alter table migtest_e_history add column sys_period_end datetime(6);
 alter table migtest_e_history alter column test_string bigint;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
@@ -102,8 +102,6 @@ create table migtest_e_history_history(
 );
 create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
 
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
@@ -131,6 +129,8 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -1,8 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -14,6 +12,7 @@ alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
 -- apply post alter
 drop table if exists migtest_e_ref;
+drop sequence if exists migtest_e_ref_seq;
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -64,14 +64,14 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( st
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique  (indextest2);
 alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique  (indextest6);
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.4__dropsFor_1.3.sql

@@ -7,8 +7,6 @@ drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -32,6 +30,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m;
 drop table if exists migtest_mtm_m_migtest_mtm_c;
 drop table if exists migtest_mtm_m_phone_numbers;

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

@@ -1,7 +1,7 @@
-1609926578,     1.0__initial.sql
--712334769,     1.1.sql
-2006095001,     1.2__dropsFor_1.1.sql
-710219599,      1.3.sql
-457206948,      1.4__dropsFor_1.3.sql
+-2130050389,    1.0__initial.sql
+-575692842,     1.1.sql
+-1790075022,    1.2__dropsFor_1.1.sql
+-1755422280,    1.3.sql
+782350608,      1.4__dropsFor_1.3.sql
 561281075,      R__order_views.sql
 

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

@@ -162,9 +162,6 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -175,3 +172,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -130,8 +130,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( p
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_mgtst_mtm_c_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
@@ -159,3 +157,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,5 +1,13 @@
 -- Migrationscripts for ebean unittest
--- apply changes
+-- apply alter tables
+alter table migtest_e_basic drop column description_file;
+alter table migtest_e_basic drop column old_boolean;
+alter table migtest_e_basic drop column old_boolean2;
+alter table migtest_e_basic drop column eref_id;
+alter table migtest_e_history2 drop column obsolete_string1;
+alter table migtest_e_history2 drop column obsolete_string2;
+-- apply post alter
+drop table migtest_e_ref cascade constraints purge;
 delimiter $$
 declare
   expected_error exception;
@@ -10,12 +18,3 @@ exception
   when expected_error then null;
 end;
 $$;
--- apply alter tables
-alter table migtest_e_basic drop column description_file;
-alter table migtest_e_basic drop column old_boolean;
-alter table migtest_e_basic drop column old_boolean2;
-alter table migtest_e_basic drop column eref_id;
-alter table migtest_e_history2 drop column obsolete_string1;
-alter table migtest_e_history2 drop column obsolete_string2;
--- apply post alter
-drop table migtest_e_ref cascade constraints purge;

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

@@ -132,11 +132,11 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( st
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql

@@ -1,15 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-delimiter $$
-declare
-  expected_error exception;
-  pragma exception_init(expected_error, -2289);
-begin
-  execute immediate 'drop sequence migtest_e_user_seq';
-exception
-  when expected_error then null;
-end;
-$$;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -27,6 +16,16 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence migtest_e_user_seq';
+exception
+  when expected_error then null;
+end;
+$$;
 drop table migtest_mtm_c_migtest_mtm_m cascade constraints purge;
 drop table migtest_mtm_m_migtest_mtm_c cascade constraints purge;
 drop table migtest_mtm_m_phone_numbers cascade constraints purge;

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

@@ -1,8 +1,8 @@
--622073680,     1.0__initial.sql
--1746822270,    1.1.sql
--762185259,     1.2__dropsFor_1.1.sql
-306379757,      1.3.sql
--748734592,     1.4__dropsFor_1.3.sql
+-554067191,     1.0__initial.sql
+187324506,      1.1.sql
+-582436324,     1.2__dropsFor_1.1.sql
+-283226837,     1.3.sql
+663051206,      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

@@ -184,9 +184,6 @@ create table migtest_oto_master (
 );
 create sequence migtest_oto_master_seq;
 
--- apply post alter
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
@@ -197,3 +194,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

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

@@ -131,8 +131,6 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( p
 -- NOT YET IMPLEMENTED: alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique  (indextest5);
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
 -- foreign keys and indices
 create index ix_mgtst_mtm_c_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mtm_c_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id);
@@ -160,3 +158,5 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id);
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id);
 
+create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);

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

@@ -1,5 +1,13 @@
 -- Migrationscripts for ebean unittest
--- apply changes
+-- apply alter tables
+alter table migtest_e_basic drop column description_file;
+alter table migtest_e_basic drop column old_boolean;
+alter table migtest_e_basic drop column old_boolean2;
+alter table migtest_e_basic drop column eref_id;
+alter table migtest_e_history2 drop column obsolete_string1;
+alter table migtest_e_history2 drop column obsolete_string2;
+-- apply post alter
+drop table migtest_e_ref cascade constraints purge;
 delimiter $$
 declare
   expected_error exception;
@@ -10,12 +18,3 @@ exception
   when expected_error then null;
 end;
 $$;
--- apply alter tables
-alter table migtest_e_basic drop column description_file;
-alter table migtest_e_basic drop column old_boolean;
-alter table migtest_e_basic drop column old_boolean2;
-alter table migtest_e_basic drop column eref_id;
-alter table migtest_e_history2 drop column obsolete_string1;
-alter table migtest_e_history2 drop column obsolete_string2;
--- apply post alter
-drop table migtest_e_ref cascade constraints purge;

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

@@ -133,11 +133,11 @@ alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( st
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade;
 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_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);
 
+create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);

ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.4__dropsFor_1.3.sql

@@ -1,15 +1,4 @@
 -- Migrationscripts for ebean unittest
--- apply changes
-delimiter $$
-declare
-  expected_error exception;
-  pragma exception_init(expected_error, -2289);
-begin
-  execute immediate 'drop sequence migtest_e_user_seq';
-exception
-  when expected_error then null;
-end;
-$$;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -27,6 +16,16 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table migtest_e_user cascade constraints purge;
+delimiter $$
+declare
+  expected_error exception;
+  pragma exception_init(expected_error, -2289);
+begin
+  execute immediate 'drop sequence migtest_e_user_seq';
+exception
+  when expected_error then null;
+end;
+$$;
 drop table migtest_mtm_c_migtest_mtm_m cascade constraints purge;
 drop table migtest_mtm_m_migtest_mtm_c cascade constraints purge;
 drop table migtest_mtm_m_phone_numbers cascade constraints purge;

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

@@ -1,8 +1,8 @@
--69967756,      1.0__initial.sql
-224068094,      1.1.sql
--762185259,     1.2__dropsFor_1.1.sql
-694608752,      1.3.sql
--748734592,     1.4__dropsFor_1.3.sql
+-712978357,     1.0__initial.sql
+-1852784090,    1.1.sql
+-582436324,     1.2__dropsFor_1.1.sql
+-734374474,     1.3.sql
+663051206,      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

@@ -99,28 +99,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history3 (
   id                            integer generated by default as identity not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history4 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history5 (
   id                            integer generated by default as identity not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history6 (
   id                            integer generated by default as identity not null,
@@ -128,7 +124,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_ref (
   id                            integer generated by default as identity not null,
@@ -167,6 +162,12 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 -- apply post alter
 create table migtest_e_history2_history(like migtest_e_history2);
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
@@ -183,11 +184,6 @@ create view migtest_e_history5_with_history as select * from migtest_e_history5
 create table migtest_e_history6_history(like migtest_e_history6);
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM';
-create index concurrently if not exists ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
-create index if not exists ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -198,6 +194,11 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM';
+create index concurrently if not exists ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
+create index if not exists ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 -- apply history trigger
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 declare

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

@@ -41,20 +41,15 @@ create table migtest_mtm_m_phone_numbers (
 
 
 update migtest_e_basic set status = 'A' where status is null;
-alter table migtest_e_basic alter column status2 type varchar(127) using status2::varchar(127);
 
 -- rename all collisions;
 
 insert into migtest_e_user (id) select distinct user_id from migtest_e_basic;
-alter table migtest_e_history add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 alter table migtest_e_history alter column test_string TYPE bigint USING (test_string::integer);
-alter table migtest_e_history alter column test_string type bigint using test_string::bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history2 set test_string = 'unknown' where test_string is null;
-alter table migtest_e_history4 alter column test_number type bigint using test_number::bigint;
-alter table migtest_e_history4_history alter column test_number type bigint using test_number::bigint;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number1 = 42 where test_number1 is null;
@@ -64,6 +59,7 @@ alter table migtest_ckey_detail add column two_key varchar(127);
 alter table migtest_ckey_parent add column assoc_id integer;
 alter table migtest_e_basic alter column status set default 'A';
 alter table migtest_e_basic alter column status set not null;
+alter table migtest_e_basic alter column status2 type varchar(127) using status2::varchar(127);
 alter table migtest_e_basic alter column status2 drop default;
 alter table migtest_e_basic alter column status2 drop not null;
 alter table migtest_e_basic alter column user_id drop not null;
@@ -72,6 +68,8 @@ alter table migtest_e_basic add column new_boolean_field boolean default true no
 alter table migtest_e_basic add column new_boolean_field2 boolean default true not null;
 alter table migtest_e_basic add column progress integer default 0 not null;
 alter table migtest_e_basic add column new_integer integer default 42 not null;
+alter table migtest_e_history add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history alter column test_string type bigint using test_string::bigint;
 alter table migtest_e_history2 alter column test_string set default 'unknown';
 alter table migtest_e_history2 alter column test_string set not null;
 alter table migtest_e_history2 add column test_string2 varchar(255);
@@ -80,6 +78,8 @@ alter table migtest_e_history2 add column new_column varchar(20);
 alter table migtest_e_history2_history add column test_string2 varchar(255);
 alter table migtest_e_history2_history add column test_string3 varchar(255) default 'unknown';
 alter table migtest_e_history2_history add column new_column varchar(20);
+alter table migtest_e_history4 alter column test_number type bigint using test_number::bigint;
+alter table migtest_e_history4_history alter column test_number type bigint using test_number::bigint;
 alter table migtest_e_history5 add column test_boolean boolean default false not null;
 alter table migtest_e_history5_history add column test_boolean boolean default false;
 alter table migtest_e_history6 alter column test_number1 set default 42;
@@ -103,9 +103,6 @@ create view migtest_e_history_with_history as select * from migtest_e_history un
 
 comment on column migtest_e_history.test_string is 'Column altered to long now';
 comment on table migtest_e_history is 'We have history now';
-create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
-create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
-create index if not exists ix_migtest_oto_child_name on migtest_oto_child (name);
 -- foreign keys and indices
 create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id);
 alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict on update restrict;
@@ -133,6 +130,9 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict on update restrict;
 alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict on update restrict;
 
+create index if not exists ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3);
+create index if not exists ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6);
+create index if not exists ix_migtest_oto_child_name on migtest_oto_child (name);
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -1,8 +1,6 @@
 -- Migrationscripts for ebean unittest
 -- drop dependencies
 drop view if exists migtest_e_history2_with_history;
--- apply changes
-drop sequence if exists migtest_e_ref_seq;
 -- apply alter tables
 alter table migtest_e_basic drop column description_file;
 alter table migtest_e_basic drop column old_boolean;
@@ -14,6 +12,7 @@ alter table migtest_e_history2_history drop column obsolete_string1;
 alter table migtest_e_history2_history drop column obsolete_string2;
 -- apply post alter
 drop table if exists migtest_e_ref cascade;
+drop sequence if exists migtest_e_ref_seq;
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

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

@@ -29,17 +29,15 @@ create table migtest_e_ref (
 
 
 update migtest_e_basic set status2 = 'N' where status2 is null;
-alter table migtest_e_basic alter column status2 type varchar(1) using status2::varchar(1);
 
 update migtest_e_basic set user_id = 23 where user_id is null;
-alter table migtest_e_history4 alter column test_number type integer using test_number::integer;
-alter table migtest_e_history4_history alter column test_number type integer using test_number::integer;
 
 -- NOTE: table has @History - special migration may be necessary
 update migtest_e_history6 set test_number2 = 7 where test_number2 is null;
 -- apply alter tables
 alter table migtest_e_basic alter column status drop default;
 alter table migtest_e_basic alter column status drop not null;
+alter table migtest_e_basic alter column status2 type varchar(1) using status2::varchar(1);
 alter table migtest_e_basic alter column status2 set default 'N';
 alter table migtest_e_basic alter column status2 set not null;
 alter table migtest_e_basic alter column user_id set default 23;
@@ -54,6 +52,8 @@ alter table migtest_e_history2 add column obsolete_string1 varchar(255);
 alter table migtest_e_history2 add column obsolete_string2 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string1 varchar(255);
 alter table migtest_e_history2_history add column obsolete_string2 varchar(255);
+alter table migtest_e_history4 alter column test_number type integer using test_number::integer;
+alter table migtest_e_history4_history alter column test_number type integer using test_number::integer;
 alter table migtest_e_history6 alter column test_number1 drop default;
 alter table migtest_e_history6 alter column test_number1 drop not null;
 alter table migtest_e_history6 alter column test_number2 set default 7;
@@ -66,17 +66,17 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique
 alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I'));
 comment on column migtest_e_history.test_string is '';
 comment on table migtest_e_history is '';
-create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index if not exists ix_m12_otoc71 on migtest_oto_child (name);
-create unique index if not exists uq_m12_otoc71 on migtest_oto_child (lower(name));
-create unique index if not exists ix_migtest_oto_master_lowername on migtest_oto_master (lower(name));
 -- foreign keys and indices
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
 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_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index if not exists ix_m12_otoc71 on migtest_oto_child (name);
+create unique index if not exists uq_m12_otoc71 on migtest_oto_child (lower(name));
+create unique index if not exists ix_migtest_oto_master_lowername on migtest_oto_master (lower(name));
 -- apply history view
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
 

ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql

@@ -8,8 +8,6 @@ drop table migtest_e_history_history;
 
 drop view if exists migtest_e_history2_with_history;
 drop view if exists migtest_e_history5_with_history;
--- apply changes
-drop sequence if exists migtest_e_user_seq;
 -- apply alter tables
 alter table migtest_ckey_detail drop column one_key;
 alter table migtest_ckey_detail drop column two_key;
@@ -32,6 +30,7 @@ alter table migtest_e_softdelete drop column deleted;
 alter table migtest_oto_child drop column master_id;
 -- apply post alter
 drop table if exists migtest_e_user cascade;
+drop sequence if exists migtest_e_user_seq;
 drop table if exists migtest_mtm_c_migtest_mtm_m cascade;
 drop table if exists migtest_mtm_m_migtest_mtm_c cascade;
 drop table if exists migtest_mtm_m_phone_numbers cascade;

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

@@ -1,8 +1,8 @@
--281382086,     1.0__initial.sql
-1309236536,     1.1.sql
-23016453,       1.2__dropsFor_1.1.sql
--1558640409,    1.3.sql
-2062908930,     1.4__dropsFor_1.3.sql
+1040369575,     1.0__initial.sql
+45294494,       1.1.sql
+1770819182,     1.2__dropsFor_1.1.sql
+-223959883,     1.3.sql
+739723472,      1.4__dropsFor_1.3.sql
 783227075,      R__multi_comments.sql
 561281075,      R__order_views.sql
 283077354,      R__pg_indexes.sql

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

@@ -99,28 +99,24 @@ create table migtest_e_history2 (
   obsolete_string2              varchar(255),
   constraint pk_migtest_e_history2 primary key (id)
 );
-alter table migtest_e_history2 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history3 (
   id                            serial not null,
   test_string                   varchar(255),
   constraint pk_migtest_e_history3 primary key (id)
 );
-alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history4 (
   id                            serial not null,
   test_number                   integer,
   constraint pk_migtest_e_history4 primary key (id)
 );
-alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history5 (
   id                            serial not null,
   test_number                   integer,
   constraint pk_migtest_e_history5 primary key (id)
 );
-alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_history6 (
   id                            serial not null,
@@ -128,7 +124,6 @@ create table migtest_e_history6 (
   test_number2                  integer not null,
   constraint pk_migtest_e_history6 primary key (id)
 );
-alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 
 create table migtest_e_ref (
   id                            serial not null,
@@ -167,6 +162,12 @@ create table migtest_oto_master (
   constraint pk_migtest_oto_master primary key (id)
 );
 
+-- apply alter tables
+alter table migtest_e_history2 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history3 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history4 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history5 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
+alter table migtest_e_history6 add column sys_period tstzrange not null default tstzrange(current_timestamp, null);
 -- apply post alter
 create table migtest_e_history2_history(like migtest_e_history2);
 create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
@@ -183,11 +184,6 @@ create view migtest_e_history5_with_history as select * from migtest_e_history5
 create table migtest_e_history6_history(like migtest_e_history6);
 create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
 
-create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
-create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
-create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM';
-create index concurrently if not exists ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
-create index if not exists ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 -- foreign keys and indices
 create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id);
 alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade on update restrict;
@@ -198,6 +194,11 @@ alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id for
 create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id);
 alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict on update restrict;
 
+create index if not exists ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1);
+create index if not exists ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5);
+create index idxd_migtest_0 on migtest_oto_child using hash (upper(name)) where upper(name) = 'JIM';
+create index concurrently if not exists ix_migtest_oto_child_lowername_id on migtest_oto_child (lower(name),id);
+create index if not exists ix_migtest_oto_child_lowername on migtest_oto_child (lower(name));
 -- apply history trigger
 create or replace function migtest_e_history2_history_version() returns trigger as $$
 declare