diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.0__initial.model.xml b/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.0__initial.model.xml deleted file mode 100644 index 4cb2aea38..000000000 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.0__initial.model.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.0__initial.sql deleted file mode 100644 index 9e44107be..000000000 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.0__initial.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Migrationscripts for ebean unittest --- apply changes -create table migtest_e_basic ( - id integer auto_increment not null, - status varchar(1), - status2 varchar(1) default 'N' not null, - name varchar(127), - description varchar(127), - constraint pk_migtest_e_basic primary key (id) -); - diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.2__dropsFor_1.1.sql b/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.2__dropsFor_1.1.sql deleted file mode 100644 index 38b133086..000000000 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/1.2__dropsFor_1.1.sql +++ /dev/null @@ -1,6 +0,0 @@ --- Migrationscripts for ebean unittest --- apply changes -CALL usp_ebean_drop_column('migtest_e_basic', 'status2'); - -CALL usp_ebean_drop_column('migtest_e_basic', 'description'); - diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/I__create_procs.sql b/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/I__create_procs.sql deleted file mode 100644 index d13ec2708..000000000 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/I__create_procs.sql +++ /dev/null @@ -1,48 +0,0 @@ --- Inital script to create stored procedures etc for mysql platform -DROP PROCEDURE IF EXISTS usp_ebean_drop_foreign_keys; - -delimiter $$ --- --- PROCEDURE: usp_ebean_drop_foreign_keys TABLE, COLUMN --- deletes all constraints and foreign keys referring to TABLE.COLUMN --- -CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255)) -BEGIN -DECLARE done INT DEFAULT FALSE; -DECLARE c_fk_name CHAR(255); -DECLARE curs CURSOR FOR SELECT CONSTRAINT_NAME from information_schema.KEY_COLUMN_USAGE -WHERE TABLE_SCHEMA = DATABASE() and TABLE_NAME = p_table_name and COLUMN_NAME = p_column_name -AND REFERENCED_TABLE_NAME IS NOT NULL; -DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; - -OPEN curs; - -read_loop: LOOP -FETCH curs INTO c_fk_name; -IF done THEN -LEAVE read_loop; -END IF; -SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name); -PREPARE stmt FROM @sql; -EXECUTE stmt; -END LOOP; - -CLOSE curs; -END -$$ - -DROP PROCEDURE IF EXISTS usp_ebean_drop_column; - -delimiter $$ --- --- PROCEDURE: usp_ebean_drop_column TABLE, COLUMN --- deletes the column and ensures that all indices and constraints are dropped first --- -CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255)) -BEGIN -CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name); -SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name); -PREPARE stmt FROM @sql; -EXECUTE stmt; -END -$$ diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/idx_mysql.migrations b/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/idx_mysql.migrations deleted file mode 100644 index 1cb8a087c..000000000 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/mysql/idx_mysql.migrations +++ /dev/null @@ -1,4 +0,0 @@ -1835064798, I__create_procs.sql -1968521526, 1.0__initial.sql --728933533, 1.2__dropsFor_1.1.sql - diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql b/ebean-test/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql rename to ebean-test/src/test/resources/dbmigration/migrationtest-history/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/dbmigration/migrationtest-history/1.2__dropsFor_1.1.sql diff --git a/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql b/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql new file mode 100644 index 000000000..0ede0c9eb --- /dev/null +++ b/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__multi_comments.sql @@ -0,0 +1,3 @@ + + -- h2 and postgres script + \ No newline at end of file diff --git a/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql b/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/dbmigration/migrationtest-history/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml b/ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml rename to ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.0__initial.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml b/ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml rename to ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.1.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml rename to ebean-test/src/test/resources/dbmigration/migrationtest-history/model/1.2__dropsFor_1.1.model.xml diff --git a/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.0__initial.sql new file mode 100644 index 000000000..c2e2019a7 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.0__initial.sql @@ -0,0 +1,17 @@ +-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest +-- apply changes +create table migtest_e_history7 ( + id integer generated by default as identity not null, + constraint pk_migtest_e_history7 primary key (id) +); + +alter table migtest_e_history7 add column sys_period_start timestamp default now(); +alter table migtest_e_history7 add column sys_period_end timestamp; +create table migtest_e_history7_history( + id integer, + sys_period_start timestamp, + sys_period_end timestamp +); +create view migtest_e_history7_with_history as select * from migtest_e_history7 union all select * from migtest_e_history7_history; + +create trigger migtest_e_history7_history_upd before update,delete on migtest_e_history7 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; diff --git a/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.2__dropsFor_1.1.sql new file mode 100644 index 000000000..692d93f76 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/1.2__dropsFor_1.1.sql @@ -0,0 +1,10 @@ +-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest +-- drop dependencies +drop trigger migtest_e_history7_history_upd; +drop view migtest_e_history7_with_history; +alter table migtest_e_history7 drop column sys_period_start; +alter table migtest_e_history7 drop column sys_period_end; +drop table migtest_e_history7_history; + + +-- apply changes diff --git a/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__multi_comments.sql b/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__multi_comments.sql new file mode 100644 index 000000000..0ede0c9eb --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__multi_comments.sql @@ -0,0 +1,3 @@ + + -- h2 and postgres script + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__order_views.sql b/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.0__initial.model.xml new file mode 100644 index 000000000..52d70c793 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.0__initial.model.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.1.model.xml similarity index 56% rename from ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.1.model.xml rename to ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.1.model.xml index 27ec6c42a..8c0a04b2b 100644 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.1.model.xml +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.1.model.xml @@ -1,7 +1,6 @@ - - + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.2__dropsFor_1.1.model.xml similarity index 57% rename from ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.2__dropsFor_1.1.model.xml rename to ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.2__dropsFor_1.1.model.xml index 7b89fb0e0..4cfc4672f 100644 --- a/ebean-ddl-generator/src/test/resources/mysql/procedures/model/1.2__dropsFor_1.1.model.xml +++ b/ebean-test/src/test/resources/migrationtest-history/dbmigration/model/1.2__dropsFor_1.1.model.xml @@ -1,7 +1,6 @@ - - + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbinit/migrationtest-procedures/mysql/1.2.sql b/ebean-test/src/test/resources/migrationtest-procedures/dbinit/mysql/1.2.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/migrationtest-procedures/mysql/1.2.sql rename to ebean-test/src/test/resources/migrationtest-procedures/dbinit/mysql/1.2.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.0__initial.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.0__initial.model.xml rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.0__initial.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.1.model.xml rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.1.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.2__dropsFor_1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/model/1.2__dropsFor_1.1.model.xml rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/model/1.2__dropsFor_1.1.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/I__create_procs.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/I__create_procs.sql rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/I__create_procs.sql diff --git a/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/R__order_views.sql b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/idx_mysql.migrations similarity index 75% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/idx_mysql.migrations rename to ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/idx_mysql.migrations index 1cb8a087c..603060aa2 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest-procedures/mysql/idx_mysql.migrations +++ b/ebean-test/src/test/resources/migrationtest-procedures/dbmigration/mysql/idx_mysql.migrations @@ -1,4 +1,5 @@ 1835064798, I__create_procs.sql 1968521526, 1.0__initial.sql -728933533, 1.2__dropsFor_1.1.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/db2/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/db2/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/db2/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/db2/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/h2/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/h2/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/h2/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/hana/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/hana/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/hana/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/hsqldb/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/hsqldb/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/hsqldb/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/mysql/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/mysql/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/mysql/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/mysql55/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/mysql55/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/mysql55/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/oracle/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/oracle/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/oracle/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/postgres/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/postgres/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/postgres/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/sqlite/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/sqlite/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/sqlite/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbinit/sqlserver17/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbinit/sqlserver17/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__db2_explain_tables.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__db2_explain_tables.sql new file mode 100644 index 000000000..b2539a5ea --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__db2_explain_tables.sql @@ -0,0 +1,8 @@ + +delimiter $$ +BEGIN +IF NOT EXISTS (SELECT * FROM SYSCAT.TABLES WHERE TABSCHEMA = CURRENT SCHEMA AND TABNAME = 'EXPLAIN_STREAM') THEN +call SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', CURRENT SCHEMA ); +END IF; +END;$$ + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/idx_db2.migrations similarity index 67% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2/idx_db2.migrations index b1d354f3f..a83d329f0 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2/idx_db2.migrations @@ -3,4 +3,6 @@ 1091886546, 1.2__dropsFor_1.1.sql -1041850370, 1.3.sql 1293885677, 1.4__dropsFor_1.3.sql +-133543359, R__db2_explain_tables.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__multi_comments.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__multi_comments.sql new file mode 100644 index 000000000..0ede0c9eb --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__multi_comments.sql @@ -0,0 +1,3 @@ + + -- h2 and postgres script + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations similarity index 68% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations index 75357518c..c5bafc1f6 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/h2/idx_h2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations @@ -3,4 +3,6 @@ 1616986842, 1.2__dropsFor_1.1.sql -1513154593, 1.3.sql 1549130952, 1.4__dropsFor_1.3.sql +783227075, R__multi_comments.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/R__order_views_hana.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/R__order_views_hana.sql new file mode 100644 index 000000000..85b1dce9f --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/R__order_views_hana.sql @@ -0,0 +1,7 @@ + + create view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id; + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations similarity index 79% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations index a3feba342..521c0c0b7 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hana/idx_hana.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations @@ -3,4 +3,5 @@ 562867593, 1.2__dropsFor_1.1.sql 1566488731, 1.3.sql 201970227, 1.4__dropsFor_1.3.sql +1906063401, R__order_views_hana.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/R__order_views_hsqldb.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/R__order_views_hsqldb.sql new file mode 100644 index 000000000..5f7ba1784 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/R__order_views_hsqldb.sql @@ -0,0 +1,8 @@ + + drop view order_agg_vw if exists ; + create view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id; + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations similarity index 79% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations index c9d7c5c84..c754652e1 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/hsqldb/idx_hsqldb.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations @@ -3,4 +3,5 @@ -1462014216, 1.2__dropsFor_1.1.sql -2039573992, 1.3.sql -1763496614, 1.4__dropsFor_1.3.sql +861001272, R__order_views_hsqldb.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.0__initial.model.xml rename to ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.1.model.xml rename to ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.2__dropsFor_1.1.model.xml rename to ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.3.model.xml rename to ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/model/1.4__dropsFor_1.3.model.xml rename to ebean-test/src/test/resources/migrationtest/dbmigration/model/1.4__dropsFor_1.3.model.xml diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations similarity index 81% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations index 9ead8d1dd..082bbefb7 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql/idx_mysql.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations @@ -3,4 +3,5 @@ 1029390755, 1.2__dropsFor_1.1.sql -380371830, 1.3.sql -724776884, 1.4__dropsFor_1.3.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations similarity index 81% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations index 1da1a9eae..48d7df33a 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/mysql55/idx_mysql.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations @@ -3,4 +3,5 @@ 1029390755, 1.2__dropsFor_1.1.sql -380371830, 1.3.sql -724776884, 1.4__dropsFor_1.3.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__oracle_only_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__oracle_only_views.sql new file mode 100644 index 000000000..1140e5361 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__oracle_only_views.sql @@ -0,0 +1,4 @@ + + -- oracle only script + select * from dual; + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations similarity index 67% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations index b0f9fe30f..784f0c1d5 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/oracle/idx_oracle.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations @@ -3,4 +3,6 @@ 238598298, 1.2__dropsFor_1.1.sql 483114276, 1.3.sql -629809805, 1.4__dropsFor_1.3.sql +1357801733, R__oracle_only_views.sql +561281075, R__order_views.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__multi_comments.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__multi_comments.sql new file mode 100644 index 000000000..0ede0c9eb --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__multi_comments.sql @@ -0,0 +1,3 @@ + + -- h2 and postgres script + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__order_views.sql new file mode 100644 index 000000000..ccf30a2c6 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__order_views.sql @@ -0,0 +1,7 @@ + + create or replace view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__pg_indexes.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__pg_indexes.sql new file mode 100644 index 000000000..fa0bab998 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/R__pg_indexes.sql @@ -0,0 +1,4 @@ + + -- postgres specific indexes + create index ix_ebasic_jmjb_gin2 on ebasic_json_map_json_b using gin(content jsonb_path_ops); + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations similarity index 59% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations index 171a8e09b..38e13bc57 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/postgres/idx_postgres.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations @@ -3,4 +3,7 @@ -1861367028, 1.2__dropsFor_1.1.sql -1798982281, 1.3.sql -1991941691, 1.4__dropsFor_1.3.sql +783227075, R__multi_comments.sql +561281075, R__order_views.sql +283077354, R__pg_indexes.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/R__order_views_sqlite.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/R__order_views_sqlite.sql new file mode 100644 index 000000000..9572b5c26 --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/R__order_views_sqlite.sql @@ -0,0 +1,8 @@ + + drop view if exists order_agg_vw; + create view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id; + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations similarity index 79% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations index f5be8c486..25e367a67 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlite/idx_sqlite.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations @@ -3,4 +3,5 @@ 1359055889, 1.2__dropsFor_1.1.sql -1764531063, 1.3.sql -1045594368, 1.4__dropsFor_1.3.sql +2034589659, R__order_views_sqlite.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.4__dropsFor_1.3.sql diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql similarity index 100% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/I__create_procs.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/R__order_views_mssql.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/R__order_views_mssql.sql new file mode 100644 index 000000000..3b90ebb2d --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/R__order_views_mssql.sql @@ -0,0 +1,10 @@ + + IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'order_agg_vw') + DROP VIEW order_agg_vw; + + create view order_agg_vw as + select d.order_id, sum(d.order_qty * d.unit_price) as order_total, + sum(d.ship_qty * d.unit_price) as ship_total + from o_order_detail d + group by d.order_id; + \ No newline at end of file diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations similarity index 82% rename from ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations index 9e3b7e650..388adffc2 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/sqlserver17/idx_sqlserver.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations @@ -4,4 +4,5 @@ -1805601919, 1.2__dropsFor_1.1.sql -1791137342, 1.3.sql -1335541264, 1.4__dropsFor_1.3.sql +1607822082, R__order_views_mssql.sql