From fca9591d0cd8fa59a8f705996e49c49e4d6833ff Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 3 Feb 2022 13:46:14 +0100 Subject: [PATCH] again some platform fixes --- .../io/ebeaninternal/dbmigration/DbMigrationTest.java | 2 +- ebean-test/src/test/resources/ebean.properties | 11 ++++++----- .../migrationtest/dbinit/{db2 => db2luw}/1.4.sql | 0 .../dbinit/{sqlserver => sqlserver17}/1.4.sql | 0 .../dbmigration/{db2 => db2luw}/1.0__initial.sql | 0 .../migrationtest/dbmigration/{db2 => db2luw}/1.1.sql | 0 .../dbmigration/{db2 => db2luw}/1.2__dropsFor_1.1.sql | 0 .../migrationtest/dbmigration/{db2 => db2luw}/1.3.sql | 0 .../dbmigration/{db2 => db2luw}/1.4__dropsFor_1.3.sql | 0 .../{db2 => db2luw}/R__db2_explain_tables.sql | 0 .../dbmigration/{db2 => db2luw}/R__order_views.sql | 0 .../dbmigration/{db2 => db2luw}/idx_db2.migrations | 0 .../{sqlserver => sqlserver17}/1.0__initial.sql | 0 .../dbmigration/{sqlserver => sqlserver17}/1.1.sql | 0 .../{sqlserver => sqlserver17}/1.2__dropsFor_1.1.sql | 0 .../dbmigration/{sqlserver => sqlserver17}/1.3.sql | 0 .../{sqlserver => sqlserver17}/1.4__dropsFor_1.3.sql | 0 .../{sqlserver => sqlserver17}/I__create_procs.sql | 0 .../R__order_views_mssql.sql | 0 .../idx_sqlserver.migrations | 0 20 files changed, 7 insertions(+), 6 deletions(-) rename ebean-test/src/test/resources/migrationtest/dbinit/{db2 => db2luw}/1.4.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbinit/{sqlserver => sqlserver17}/1.4.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/1.0__initial.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/1.1.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/1.2__dropsFor_1.1.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/1.3.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/1.4__dropsFor_1.3.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/R__db2_explain_tables.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/R__order_views.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{db2 => db2luw}/idx_db2.migrations (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/1.0__initial.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/1.1.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/1.2__dropsFor_1.1.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/1.3.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/1.4__dropsFor_1.3.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/I__create_procs.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/R__order_views_mssql.sql (100%) rename ebean-test/src/test/resources/migrationtest/dbmigration/{sqlserver => sqlserver17}/idx_sqlserver.migrations (100%) diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java index e3bd4f68c..ae383861b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DbMigrationTest extends BaseTestCase { private void runScript(String scriptName) throws IOException { - URL url = getClass().getResource("/migrationtest/dbmigration/" + server().platform().base().name().toLowerCase() + "/" + scriptName); + URL url = getClass().getResource("/migrationtest/dbmigration/" + server().platform().name().toLowerCase() + "/" + scriptName); assert url != null : scriptName + " not found"; server().script().run(url); } diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties index e4ac539b4..27596863f 100644 --- a/ebean-test/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -214,9 +214,9 @@ ebean.migrationtest.migration.run=false ebean.migrationtest.migration.includeIndex=true ebean.migrationtest.migration.generateInit=true ebean.migrationtest.migration.generatePendingDrop=auto -ebean.migrationtest.migration.platforms=db2luw,h2,hsqldb,mysql,mysql55,postgres,oracle,sqlite,sqlserver17,hana -migration.migrationtest.db2luw.prefix=db2 -migration.migrationtest.sqlserver17.prefix=sqlserver +ebean.migrationtest.migration.platforms=db2luw,h2,hsqldb,mysql,mysql55,postgres,oracle,sqlite,sqlserver17,hana +#migration.migrationtest.db2luw.prefix=db2 +#migration.migrationtest.sqlserver17.prefix=sqlserver # need to generate unique statements to prevent them from being filtered out as duplicates by the DdlRunner @@ -244,5 +244,6 @@ ebean.db2-migration.ddl.generate=false ebean.db2-migration.ddl.run=false ebean.db2-migration.migration.run=true ebean.db2-migration.databasePlatformName=db2luw -ebean.db2-migration.migration.migrationPath=migrationtest/dbmigration -ebean.db2-migration.migration.migrationInitPath=migrationtest/dbinit \ No newline at end of file +# workaround for https://github.com/ebean-orm/ebean-migration/issues/102 +ebean.db2-migration.migration.migrationPath=migrationtest/dbmigration/db2 +ebean.db2-migration.migration.migrationInitPath=migrationtest/dbinit/db2 \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/db2/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbinit/db2/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/db2luw/1.4.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver/1.4.sql b/ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbinit/sqlserver/1.4.sql rename to ebean-test/src/test/resources/migrationtest/dbinit/sqlserver17/1.4.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.2__dropsFor_1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/1.4__dropsFor_1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/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/db2luw/R__db2_explain_tables.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__db2_explain_tables.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/R__db2_explain_tables.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__order_views.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/R__order_views.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/R__order_views.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/db2/idx_db2.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.0__initial.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.1.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/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-test/src/test/resources/migrationtest/dbmigration/sqlserver/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-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/1.3.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/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-test/src/test/resources/migrationtest/dbmigration/sqlserver/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-test/src/test/resources/migrationtest/dbmigration/sqlserver/I__create_procs.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/I__create_procs.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/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/sqlserver/R__order_views_mssql.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/R__order_views_mssql.sql similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/R__order_views_mssql.sql rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/R__order_views_mssql.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations similarity index 100% rename from ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver/idx_sqlserver.migrations rename to ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations