diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql index 7237ea044..70742f488 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.0__initial.sql @@ -1,41 +1,48 @@ -- Migrationscripts for ebean unittest -- apply changes create table migtest_fk_cascade ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, one_id numeric(19), constraint pk_migtest_fk_cascade primary key (id) ); +create sequence migtest_fk_cascade_seq as bigint start with 1 increment by 50; create table migtest_fk_cascade_one ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, constraint pk_migtest_fk_cascade_one primary key (id) ); +create sequence migtest_fk_cascade_one_seq as bigint start with 1 increment by 50; create table migtest_fk_none ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, one_id numeric(19), constraint pk_migtest_fk_none primary key (id) ); +create sequence migtest_fk_none_seq as bigint start with 1 increment by 50; create table migtest_fk_none_via_join ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, one_id numeric(19), constraint pk_migtest_fk_none_via_join primary key (id) ); +create sequence migtest_fk_none_via_join_seq as bigint start with 1 increment by 50; create table migtest_fk_one ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, constraint pk_migtest_fk_one primary key (id) ); +create sequence migtest_fk_one_seq as bigint start with 1 increment by 50; + create table migtest_fk_set_null ( - id numeric(19) identity(1,1) not null, + id numeric(19) not null, one_id numeric(19), constraint pk_migtest_fk_set_null primary key (id) ); +create sequence migtest_fk_set_null_seq as bigint start with 1 increment by 50; create table migtest_e_basic ( - id integer identity(1,1) not null, + id integer not null, status varchar(1), name varchar(127), description varchar(127), @@ -55,29 +62,34 @@ create table migtest_e_basic ( ); create unique nonclustered index uq_migtest_e_basic_indextest2 on migtest_e_basic(indextest2) where indextest2 is not null; create unique nonclustered index uq_migtest_e_basic_indextest6 on migtest_e_basic(indextest6) where indextest6 is not null; +create sequence migtest_e_basic_seq as bigint start with 1 increment by 50; create table migtest_e_history ( - id integer identity(1,1) not null, + id integer not null, test_string varchar(255), constraint pk_migtest_e_history primary key (id) ); +create sequence pk_migtest_e_history_seq as bigint start with 1 increment by 50; create table migtest_e_history2 ( - id integer identity(1,1) not null, + id integer not null, test_string varchar(255), constraint pk_migtest_e_history2 primary key (id) ); +create sequence migtest_e_history2_seq as bigint start with 1 increment by 50; create table migtest_e_ref ( - id integer identity(1,1) not null, + id integer not null, constraint pk_migtest_e_ref primary key (id) ); +create sequence migtest_e_ref_seq as bigint start with 1 increment by 50; create table migtest_e_softdelete ( - id integer identity(1,1) not null, + id integer not null, test_string varchar(255), constraint pk_migtest_e_softdelete primary key (id) ); +create sequence migtest_e_softdelete_seq as bigint start with 1 increment by 50; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql index 810437398..9bdf6cdc6 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.1.sql @@ -1,9 +1,10 @@ -- Migrationscripts for ebean unittest -- apply changes create table migtest_e_user ( - id integer identity(1,1) not null, + id integer not null, constraint pk_migtest_e_user primary key (id) ); +create sequence migtest_e_user_seq as bigint start with 1 increment by 50; IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_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); @@ -32,7 +33,7 @@ alter table migtest_e_basic add new_string_field varchar(255) not null default ' alter table migtest_e_basic add new_boolean_field bit default 0 not null; update migtest_e_basic set new_boolean_field = old_boolean; -alter table migtest_e_basic add new_boolean_field2 bit default 0 not null; +alter table migtest_e_basic add new_boolean_field2 bit default 1 not null; alter table migtest_e_basic add progress integer not null default 0; alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2)); alter table migtest_e_basic add new_integer integer not null default 42; diff --git a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql index 9cfd7a26d..c6add60d1 100644 --- a/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/sqlserver/1.3.sql @@ -4,6 +4,7 @@ create table migtest_e_ref ( id integer identity(1,1) not null, constraint pk_migtest_e_ref primary key (id) ); +create sequence migtest_e_ref_seq as bigint start with 1 increment by 50; IF OBJECT_ID('fk_migtest_fk_cascade_one_id', 'F') IS NOT NULL alter table migtest_fk_cascade drop constraint fk_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 cascade; diff --git a/src/test/resources/docker-run.properties b/src/test/resources/docker-run.properties index 467515d9b..c19909fda 100644 --- a/src/test/resources/docker-run.properties +++ b/src/test/resources/docker-run.properties @@ -5,12 +5,12 @@ #mysql.dbPassword=test #mysql.startMode=dropcreate -#sqlserver.version=2017-CU2 -#sqlserver.port=1433 -#sqlserver.dbName=test_ebean -#sqlserver.dbUser=test_ebean -#sqlserver.dbPassword=SqlS3rv#r -#sqlserver.startMode=dropcreate +sqlserver.version=2017-CU2 +sqlserver.port=1433 +sqlserver.dbName=test_ebean +sqlserver.dbUser=test_ebean +sqlserver.dbPassword=SqlS3rv#r +sqlserver.startMode=dropcreate #oracle.version=latest #oracle.dbUser=test_ebean diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties index de6dedf71..6ad2403a8 100644 --- a/src/test/resources/ebean.properties +++ b/src/test/resources/ebean.properties @@ -15,12 +15,12 @@ ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager #ebean.autotune.profiling=true #ebean.autotune.profilingUpdateFrequency=5 -ebean.sqlserver.ddl.createOnly=true +#ebean.sqlserver.ddl.createOnly=true ebean.ddl.generate=true ebean.ddl.run=true ebean.ddl.header=-- Generated by ebean ${version} at ${timestamp} ebean.packages=org.tests -datasource.default=h2 +datasource.default=sqlserver ebean.autoReadOnlyDataSource=true