From 4fe8ef2b23dafeafc785872df87bf12ac1a852c2 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 22 Mar 2022 09:42:19 +0100 Subject: [PATCH 01/17] Support schema in history-entities --- .../ddlgeneration/platform/BaseTableDdl.java | 29 +++++------- .../ddlgeneration/platform/Db2HistoryDdl.java | 24 +++------- .../platform/DbTableBasedHistoryDdl.java | 44 +++++++++++++++++++ .../platform/DbTriggerBasedHistoryDdl.java | 39 ++++------------ .../platform/HanaHistoryDdl.java | 18 +------- .../platform/PlatformHistoryDdl.java | 19 ++++---- .../platform/PostgresHistoryDdl.java | 19 ++++++++ 7 files changed, 99 insertions(+), 93 deletions(-) create mode 100644 ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTableBasedHistoryDdl.java diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 60b22552c..f9c238d5d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -4,7 +4,6 @@ import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.DbConstraintNaming; import io.ebean.config.NamingConvention; -import io.ebean.config.dbplatform.DbHistorySupport; import io.ebean.config.dbplatform.IdType; import io.ebean.util.StringHelper; import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer; @@ -61,7 +60,7 @@ public class BaseTableDdl implements TableDdl { private final boolean strictMode; - private final boolean alterHistoryTables; + private final PlatformHistoryDdl.TableBased tableHistory; /** * Helper class that is used to execute the migration ddl before and after the migration action. @@ -180,11 +179,10 @@ public class BaseTableDdl implements TableDdl { this.platformDdl = platformDdl; this.platformDdl.configure(config); this.strictMode = config.isDdlStrictMode(); - DbHistorySupport hist = platformDdl.getPlatform().getHistorySupport(); - if (hist == null) { - this.alterHistoryTables = false; + if (platformDdl.historyDdl instanceof PlatformHistoryDdl.TableBased) { + this.tableHistory = (PlatformHistoryDdl.TableBased) platformDdl.historyDdl; } else { - this.alterHistoryTables = platformDdl.historyDdl.alterHistoryTables(); + this.tableHistory = null; } } @@ -617,8 +615,8 @@ public class BaseTableDdl implements TableDdl { if (isTrue(addColumn.isWithHistory())) { platformDdl.regenerateHistoryTriggers(writer, tableName); // make same changes to the history table - if (alterHistoryTables) { - String historyTable = historyTable(tableName); + if (tableHistory != null) { + String historyTable = tableHistory.historyTableName(tableName); for (Column column : columns) { alterTableAddColumn(writer, historyTable, column, true, true); } @@ -658,8 +656,8 @@ public class BaseTableDdl implements TableDdl { if (isTrue(dropColumn.isWithHistory())) { platformDdl.regenerateHistoryTriggers(writer, tableName); // also drop from the history table - if (alterHistoryTables) { - alterTableDropColumn(writer, historyTable(tableName), dropColumn.getColumnName()); + if (tableHistory != null) { + alterTableDropColumn(writer, tableHistory.historyTableName(tableName), dropColumn.getColumnName()); } } } @@ -737,13 +735,6 @@ public class BaseTableDdl implements TableDdl { platformDdl.addColumnComment(writer.applyPostAlter(), alterColumn.getTableName(), alterColumn.getColumnName(), alterColumn.getComment()); } - /** - * Return the name of the history table given the base table name. - */ - protected String historyTable(String baseTable) { - return naming.normaliseTable(baseTable) + historyTableSuffix; - } - /** * alter all the base attributes (type/default/notnull) of the column together. * Some platforms (like mysql/sqlserver/hana) must do that in one statement, @@ -764,9 +755,9 @@ public class BaseTableDdl implements TableDdl { } if (applyToHistory) { platformDdl.regenerateHistoryTriggers(writer, alter.getTableName()); - if (alterHistoryTables) { + if (tableHistory != null) { AlterColumn alterHistoryColumn = new AlterColumn(); - alterHistoryColumn.setTableName(historyTable(alter.getTableName())); + alterHistoryColumn.setTableName(tableHistory.historyTableName(alter.getTableName())); alterHistoryColumn.setColumnName(alter.getColumnName()); // ignore default value (not needed on history tables) alterHistoryColumn.setCurrentType(alter.getCurrentType()); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java index 17855e8fa..b1fcbcc55 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java @@ -1,7 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.DatabaseConfig; -import io.ebean.config.DbConstraintNaming; import io.ebeaninternal.dbmigration.ddlgeneration.DdlAlterTable; import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; @@ -14,29 +13,24 @@ import io.ebeaninternal.dbmigration.model.MTable; * * @author Roland Praml, FOCONIS AG */ -public class Db2HistoryDdl implements PlatformHistoryDdl { +public class Db2HistoryDdl extends DbTableBasedHistoryDdl implements PlatformHistoryDdl { private String systemPeriodStart; private String systemPeriodEnd; private String transactionId; - private PlatformDdl platformDdl; - private DbConstraintNaming constraintNaming; - private String historySuffix; @Override public void configure(DatabaseConfig config, PlatformDdl platformDdl) { + super.configure(config, platformDdl); this.systemPeriodStart = config.getAsOfSysPeriod() + "_start"; this.systemPeriodEnd = config.getAsOfSysPeriod() + "_end"; this.transactionId = config.getAsOfSysPeriod() + "_txn"; // required for DB2 - this.platformDdl = platformDdl; - this.constraintNaming = config.getConstraintNaming(); - this.historySuffix = config.getHistoryTableSuffix(); } @Override public void createWithHistory(DdlWrite writer, MTable table) { String tableName = table.getName(); - String historyTableName = historyTable(tableName); + String historyTableName = historyTableName(tableName); // DB2 requires an EXACT copy (same column types with null/non-null, same order) addSysPeriodColumns(writer, tableName); @@ -74,7 +68,7 @@ public class Db2HistoryDdl implements PlatformHistoryDdl { platformDdl.alterTableDropColumn(writer, baseTable, transactionId); // drop the history table - writer.applyPostAlter().append("drop table ").append(historyTable(baseTable)).endOfStatement(); + writer.applyPostAlter().append("drop table ").append(historyTableName(baseTable)).endOfStatement(); } @Override @@ -86,10 +80,6 @@ public class Db2HistoryDdl implements PlatformHistoryDdl { createWithHistory(writer, table); } - @Override - public boolean alterHistoryTables() { - return true; - } @Override public void updateTriggers(DdlWrite writer, String tableName) { @@ -107,11 +97,7 @@ public class Db2HistoryDdl implements PlatformHistoryDdl { } public void enableSystemVersioning(DdlBuffer apply, String tableName) { - apply.append("alter table ").append(tableName).append(" add versioning use history table ").append(historyTable(tableName)).endOfStatement(); - } - - protected String historyTable(String tableName) { - return constraintNaming.normaliseTable(tableName) + historySuffix; + apply.append("alter table ").append(tableName).append(" add versioning use history table ").append(historyTableName(tableName)).endOfStatement(); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTableBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTableBasedHistoryDdl.java new file mode 100644 index 000000000..4d7b0deca --- /dev/null +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTableBasedHistoryDdl.java @@ -0,0 +1,44 @@ +package io.ebeaninternal.dbmigration.ddlgeneration.platform; + +import io.ebean.config.DatabaseConfig; +import io.ebean.config.DbConstraintNaming; + +/** + * Base implementation for all histories, where we must maintain history table (trigger based, db2 and hana) + * + * @author Roland Praml, FOCONIS AG + * + */ +public abstract class DbTableBasedHistoryDdl implements PlatformHistoryDdl.TableBased { + + private DbConstraintNaming constraintNaming; + private String historySuffix; + protected PlatformDdl platformDdl; + + @Override + public void configure(DatabaseConfig config, PlatformDdl platformDdl) { + this.platformDdl = platformDdl; + this.historySuffix = config.getHistoryTableSuffix(); + this.constraintNaming = config.getConstraintNaming(); + } + + @Override + public String historyTableName(String baseTableName) { + return normalise(baseTableName, historySuffix); + } + + protected String normalise(String tableName, String suffix) { + String normalized = quote(normalise(tableName) + suffix); + int lastPeriod = tableName.lastIndexOf('.'); + return tableName.substring(0, lastPeriod + 1) + normalized; + } + + protected String normalise(String tableName) { + return constraintNaming.normaliseTable(tableName); + } + + protected String quote(String dbName) { + return platformDdl.quote(dbName); + } + +} diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index f46dd6977..33167deac 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -1,7 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.DatabaseConfig; -import io.ebean.config.DbConstraintNaming; import io.ebeaninternal.dbmigration.ddlgeneration.DdlAlterTable; import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; @@ -15,18 +14,14 @@ import java.util.List; /** * Uses DB triggers to maintain a history table. */ -public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { - - protected DbConstraintNaming constraintNaming; - - protected PlatformDdl platformDdl; +public abstract class DbTriggerBasedHistoryDdl extends DbTableBasedHistoryDdl implements PlatformHistoryDdl { protected String sysPeriod; protected String sysPeriodStart; protected String sysPeriodEnd; protected String viewSuffix; - protected String historySuffix; + protected String sysPeriodType = "datetime(6)"; protected String now = "now(6)"; @@ -37,11 +32,9 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { @Override public void configure(DatabaseConfig config, PlatformDdl platformDdl) { - this.platformDdl = platformDdl; + super.configure(config, platformDdl); this.sysPeriod = config.getAsOfSysPeriod(); this.viewSuffix = config.getAsOfViewSuffix(); - this.historySuffix = config.getHistoryTableSuffix(); - this.constraintNaming = config.getConstraintNaming(); this.sysPeriodStart = sysPeriod + "_start"; this.sysPeriodEnd = sysPeriod + "_end"; @@ -121,33 +114,24 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { protected abstract void dropTriggers(DdlBuffer buffer, String baseTable); - - protected String normalise(String tableName) { - return constraintNaming.normaliseTable(tableName); - } - - protected String historyTableName(String baseTableName) { - return quote(normalise(baseTableName) + historySuffix); - } - protected String historyViewName(String baseTableName) { - return quote(normalise(baseTableName) + viewSuffix); + return normalise(baseTableName, viewSuffix); } protected String procedureName(String baseTableName) { - return normalise(baseTableName) + "_history_version"; + return normalise(baseTableName, "_history_version"); } protected String triggerName(String baseTableName) { - return normalise(baseTableName) + "_history_upd"; + return normalise(baseTableName, "_history_upd"); } protected String updateTriggerName(String baseTableName) { - return normalise(baseTableName) + "_history_upd"; + return normalise(baseTableName, "_history_upd"); } protected String deleteTriggerName(String baseTableName) { - return normalise(baseTableName) + "_history_del"; + return normalise(baseTableName, "_history_del"); } protected void addSysPeriodColumns(DdlWrite writer, String baseTableName, String whenCreatedColumn) { @@ -264,12 +248,5 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { return table.allHistoryColumns(true); } - @Override - public boolean alterHistoryTables() { - return true; - } - protected String quote(String dbName) { - return platformDdl.quote(dbName); - } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java index d8877e596..742f23c45 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/HanaHistoryDdl.java @@ -1,7 +1,6 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.config.DatabaseConfig; -import io.ebean.config.DbConstraintNaming; import io.ebeaninternal.dbmigration.ddlgeneration.DdlAlterTable; import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlWrite; @@ -12,21 +11,16 @@ import io.ebeaninternal.dbmigration.model.MTable; import java.util.Collection; -public class HanaHistoryDdl implements PlatformHistoryDdl { +public class HanaHistoryDdl extends DbTableBasedHistoryDdl implements PlatformHistoryDdl { private String systemPeriodStart; private String systemPeriodEnd; - private PlatformDdl platformDdl; - private DbConstraintNaming constraintNaming; - private String historySuffix; @Override public void configure(DatabaseConfig config, PlatformDdl platformDdl) { + super.configure(config, platformDdl); this.systemPeriodStart = config.getAsOfSysPeriod() + "_start"; this.systemPeriodEnd = config.getAsOfSysPeriod() + "_end"; - this.platformDdl = platformDdl; - this.constraintNaming = config.getConstraintNaming(); - this.historySuffix = config.getHistoryTableSuffix(); } @Override @@ -95,11 +89,6 @@ public class HanaHistoryDdl implements PlatformHistoryDdl { createWithHistory(writer, table); } - @Override - public boolean alterHistoryTables() { - return true; - } - @Override public void updateTriggers(DdlWrite writer, String tableName) { DdlAlterTable alter = platformDdl.alterTable(writer, tableName); @@ -140,8 +129,5 @@ public class HanaHistoryDdl implements PlatformHistoryDdl { apply.endOfStatement(); } - protected String historyTableName(String tableName) { - return constraintNaming.normaliseTable(tableName) + historySuffix; - } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java index 4dd1dec6d..dc027055e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformHistoryDdl.java @@ -31,14 +31,6 @@ public interface PlatformHistoryDdl { */ void addHistoryTable(DdlWrite writer, AddHistoryTable addHistoryTable); - /** - * Returns true, if alters on the live tables should be applied also to the history tables. This is required for DbTriggerBased - * histories or on platforms like Hana, which are not SQL2011 history compatible (at least from DDL perspective) - */ - default boolean alterHistoryTables() { - return false; - } - /** * Regenerate the history triggers/stored function due to column added/dropped/included or excluded. * @@ -47,4 +39,15 @@ public interface PlatformHistoryDdl { default void updateTriggers(DdlWrite writer, String tableName) { // nop } + + /** + * When history is table based, then alters on the live tables are applied also to the history tables. This is required for + * DbTriggerBased histories or on platforms like Hana, which are not SQL2011 history compatible (at least from DDL perspective) + */ + interface TableBased extends PlatformHistoryDdl { + /** + * Returns the history table name with propert quotes. + */ + public String historyTableName(String baseTableName); + } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java index 4a54edd92..3aace9f58 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PostgresHistoryDdl.java @@ -107,4 +107,23 @@ public class PostgresHistoryDdl extends DbTriggerBasedHistoryDdl { buffer.append(");").newLine(); } + @Override + protected String procedureName(String baseTableName) { + return normalise(baseTableName) + "_history_version"; + } + + @Override + protected String triggerName(String baseTableName) { + return normalise(baseTableName) + "_history_upd"; + } + + @Override + protected String updateTriggerName(String baseTableName) { + return normalise(baseTableName) + "_history_upd"; + } + + @Override + protected String deleteTriggerName(String baseTableName) { + return normalise(baseTableName) + "_history_del"; + } } From 00686fcccffd958171791c83b02dc1806ea41684 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 22 Mar 2022 09:58:20 +0100 Subject: [PATCH 02/17] DB2: ignore case in "drop if exists" checks --- .../ddlgeneration/platform/DB2Ddl.java | 16 +++++-- .../migrationtest/dbmigration/db2fori/1.1.sql | 22 +++++----- .../dbmigration/db2fori/1.2__dropsFor_1.1.sql | 2 +- .../migrationtest/dbmigration/db2fori/1.3.sql | 42 +++++++++---------- .../dbmigration/db2fori/1.4__dropsFor_1.3.sql | 2 +- .../dbmigration/db2fori/idx_db2.migrations | 8 ++-- .../dbmigration/db2legacy/1.1.sql | 22 +++++----- .../db2legacy/1.2__dropsFor_1.1.sql | 2 +- .../dbmigration/db2legacy/1.3.sql | 42 +++++++++---------- .../db2legacy/1.4__dropsFor_1.3.sql | 2 +- .../dbmigration/db2legacy/idx_db2.migrations | 8 ++-- .../migrationtest/dbmigration/db2luw/1.1.sql | 22 +++++----- .../dbmigration/db2luw/1.2__dropsFor_1.1.sql | 2 +- .../migrationtest/dbmigration/db2luw/1.3.sql | 42 +++++++++---------- .../dbmigration/db2luw/1.4__dropsFor_1.3.sql | 2 +- .../dbmigration/db2luw/idx_db2.migrations | 8 ++-- .../migrationtest/dbmigration/db2zos/1.1.sql | 22 +++++----- .../dbmigration/db2zos/1.2__dropsFor_1.1.sql | 2 +- .../migrationtest/dbmigration/db2zos/1.3.sql | 42 +++++++++---------- .../dbmigration/db2zos/1.4__dropsFor_1.3.sql | 2 +- .../dbmigration/db2zos/idx_db2.migrations | 8 ++-- 21 files changed, 164 insertions(+), 156 deletions(-) diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java index b8ad7ca2d..8e1cd64d9 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java @@ -88,15 +88,21 @@ public class DB2Ddl extends PlatformDdl { + "\n" + dropIndex(uniqueConstraintName, tableName); } + private void assertNoSchema(String objName) { + if (objName.indexOf('.') != -1) { + throw new UnsupportedOperationException("Schemas are not yet supported. ObjectName: '" + objName + "'"); + } + } @Override public String alterTableDropConstraint(String tableName, String constraintName) { + assertNoSchema(tableName); StringBuilder sb = new StringBuilder(300); sb.append("delimiter $$\n") .append("begin\n") - .append("if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = '") + .append("if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = '") .append(maxConstraintName(constraintName).toUpperCase()) - .append("' and tabname = '").append(naming.normaliseTable(tableName).toUpperCase()).append("') then\n") + .append("' and ucase(tabname) = '").append(naming.normaliseTable(tableName).toUpperCase()).append("') then\n") .append(" prepare stmt from 'alter table ").append(tableName) .append(" drop constraint ").append(maxConstraintName(constraintName)).append("';\n") @@ -110,10 +116,11 @@ public class DB2Ddl extends PlatformDdl { @Override public String dropIndex(String indexName, String tableName, boolean concurrent) { + assertNoSchema(indexName); StringBuilder sb = new StringBuilder(300); sb.append("delimiter $$\n") .append("begin\n") - .append("if exists (select indname from syscat.indexes where indschema = current_schema and indname = '") + .append("if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = '") .append(maxConstraintName(indexName).toUpperCase()).append("') then\n") .append(" prepare stmt from 'drop index ").append(maxConstraintName(indexName)).append("';\n") .append(" execute stmt;\n") @@ -124,10 +131,11 @@ public class DB2Ddl extends PlatformDdl { @Override public String dropSequence(String sequenceName) { + assertNoSchema(sequenceName); StringBuilder sb = new StringBuilder(300); sb.append("delimiter $$\n"); sb.append("begin\n"); - sb.append("if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = '") + sb.append("if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = '") .append(maxConstraintName(sequenceName).toUpperCase()).append("') then\n"); sb.append(" prepare stmt from 'drop sequence ").append(maxConstraintName(sequenceName)).append("';\n"); sb.append(" execute stmt;\n"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql index 1cc7b4b1d..56fde4bef 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql @@ -2,77 +2,77 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then prepare stmt from 'drop index uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then prepare stmt from 'drop index ix_migtest_e_basic_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index ix_migtest_e_basic_indextest5'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql index 7f78aa9b3..0e29ac8b4 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql @@ -18,7 +18,7 @@ alter table migtest_e_history2 add versioning use history table migtest_e_histor drop table migtest_e_ref; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_REF_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_REF_SEQ') then prepare stmt from 'drop sequence migtest_e_ref_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql index 2fcd77858..e87e0474f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql @@ -2,147 +2,147 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and tabname = 'MIGTEST_CKEY_DETAIL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and ucase(tabname) = 'MIGTEST_CKEY_DETAIL') then prepare stmt from 'alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_ONE_ID' and tabname = 'MIGTEST_FK_NONE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE') then prepare stmt from 'alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and tabname = 'MIGTEST_FK_NONE_VIA_JOIN') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE_VIA_JOIN') then prepare stmt from 'alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_description'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then prepare stmt from 'drop index uq_migtest_e_basic_description'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_E_BASIC_USER_ID' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_E_BASIC_USER_ID' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then prepare stmt from 'drop index uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_NAME' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_NAME' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_name'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_NAME') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_NAME') then prepare stmt from 'drop index uq_migtest_e_basic_name'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then prepare stmt from 'drop index uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then prepare stmt from 'drop index ix_migtest_e_basic_indextest3'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index ix_migtest_e_basic_indextest6'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql index 5542a954f..95bd2ed00 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.4__dropsFor_1.3.sql @@ -43,7 +43,7 @@ alter table migtest_e_history5 add versioning use history table migtest_e_histor drop table migtest_e_user; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_USER_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_USER_SEQ') then prepare stmt from 'drop sequence migtest_e_user_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations index 69a27f3a5..f354bfaff 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations @@ -1,7 +1,7 @@ -1073246286, 1.0__initial.sql -2043476851, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql -1155358918, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +1098680715, 1.1.sql +-1405930325, 1.2__dropsFor_1.1.sql +2071169682, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql index 21013eea0..109316b0a 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql @@ -2,77 +2,77 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_65KF6L' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_65KF6L' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_WICX8X' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_WICX8X' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__BSC_STTS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__BSC_STTS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__B_Z543FG' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__B_Z543FG' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_4AYBZY' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_4AYBZY' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_4aybzy'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_4AYBZY') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_4AYBZY') then prepare stmt from 'drop index uq_mgtst__b_4aybzy'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_4AYC02' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_4AYC02' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc02'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_4AYC02') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_4AYC02') then prepare stmt from 'drop index uq_mgtst__b_4ayc02'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__N_773SOK' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__N_773SOK' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_mgtst__n_773sok'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MGTST__B_EU8CSQ') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MGTST__B_EU8CSQ') then prepare stmt from 'drop index ix_mgtst__b_eu8csq'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MGTST__B_EU8CSU') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MGTST__B_EU8CSU') then prepare stmt from 'drop index ix_mgtst__b_eu8csu'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql index 7f78aa9b3..0e29ac8b4 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql @@ -18,7 +18,7 @@ alter table migtest_e_history2 add versioning use history table migtest_e_histor drop table migtest_e_ref; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_REF_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_REF_SEQ') then prepare stmt from 'drop sequence migtest_e_ref_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql index 358d219a8..aae7b02c8 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql @@ -2,147 +2,147 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_CK_E1QKB5' and tabname = 'MIGTEST_CKEY_DETAIL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_CK_E1QKB5' and ucase(tabname) = 'MIGTEST_CKEY_DETAIL') then prepare stmt from 'alter table migtest_ckey_detail drop constraint fk_mgtst_ck_e1qkb5'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_65KF6L' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_65KF6L' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_NN_N_D' and tabname = 'MIGTEST_FK_NONE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_NN_N_D' and ucase(tabname) = 'MIGTEST_FK_NONE') then prepare stmt from 'alter table migtest_fk_none drop constraint fk_mgtst_fk_nn_n_d'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_9TKNZJ' and tabname = 'MIGTEST_FK_NONE_VIA_JOIN') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_9TKNZJ' and ucase(tabname) = 'MIGTEST_FK_NONE_VIA_JOIN') then prepare stmt from 'alter table migtest_fk_none_via_join drop constraint fk_mgtst_fk_9tknzj'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST_FK_WICX8X' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST_FK_WICX8X' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__BSC_STTS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__BSC_STTS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__B_Z543FG' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__B_Z543FG' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_VS45XO' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_VS45XO' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_vs45xo'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_VS45XO') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_VS45XO') then prepare stmt from 'drop index uq_mgtst__b_vs45xo'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MGTST__BSC_SR_D' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MGTST__BSC_SR_D' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint fk_mgtst__bsc_sr_d'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_UCFCNE' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_UCFCNE' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_ucfcne'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_UCFCNE') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_UCFCNE') then prepare stmt from 'drop index uq_mgtst__b_ucfcne'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__BSC_NM' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__BSC_NM' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__bsc_nm'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__BSC_NM') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__BSC_NM') then prepare stmt from 'drop index uq_mgtst__bsc_nm'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_4AYC00' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_4AYC00' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc00'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_4AYC00') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_4AYC00') then prepare stmt from 'drop index uq_mgtst__b_4ayc00'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MGTST__B_4AYC01' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MGTST__B_4AYC01' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc01'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MGTST__B_4AYC01') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MGTST__B_4AYC01') then prepare stmt from 'drop index uq_mgtst__b_4ayc01'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MGTST__N_773SOK' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MGTST__N_773SOK' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_mgtst__n_773sok'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MGTST__B_EU8CSS') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MGTST__B_EU8CSS') then prepare stmt from 'drop index ix_mgtst__b_eu8css'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MGTST__B_EU8CSV') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MGTST__B_EU8CSV') then prepare stmt from 'drop index ix_mgtst__b_eu8csv'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql index 5542a954f..95bd2ed00 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.4__dropsFor_1.3.sql @@ -43,7 +43,7 @@ alter table migtest_e_history5 add versioning use history table migtest_e_histor drop table migtest_e_user; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_USER_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_USER_SEQ') then prepare stmt from 'drop sequence migtest_e_user_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations index 880eb4bf6..dfe6ba557 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations @@ -1,7 +1,7 @@ 2054922533, 1.0__initial.sql -1256892738, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql -1760988648, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +1340888486, 1.1.sql +-1405930325, 1.2__dropsFor_1.1.sql +923642558, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql index 2fb812410..c874d6de8 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql @@ -2,77 +2,77 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then prepare stmt from 'drop index uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then prepare stmt from 'drop index ix_migtest_e_basic_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index ix_migtest_e_basic_indextest5'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql index 7f78aa9b3..0e29ac8b4 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql @@ -18,7 +18,7 @@ alter table migtest_e_history2 add versioning use history table migtest_e_histor drop table migtest_e_ref; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_REF_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_REF_SEQ') then prepare stmt from 'drop sequence migtest_e_ref_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql index 9dbb719d6..f2b1f1f55 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql @@ -2,147 +2,147 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and tabname = 'MIGTEST_CKEY_DETAIL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and ucase(tabname) = 'MIGTEST_CKEY_DETAIL') then prepare stmt from 'alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_ONE_ID' and tabname = 'MIGTEST_FK_NONE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE') then prepare stmt from 'alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and tabname = 'MIGTEST_FK_NONE_VIA_JOIN') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE_VIA_JOIN') then prepare stmt from 'alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_description'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then prepare stmt from 'drop index uq_migtest_e_basic_description'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_E_BASIC_USER_ID' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_E_BASIC_USER_ID' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then prepare stmt from 'drop index uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_NAME' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_NAME' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_name'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_NAME') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_NAME') then prepare stmt from 'drop index uq_migtest_e_basic_name'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then prepare stmt from 'drop index uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then prepare stmt from 'drop index ix_migtest_e_basic_indextest3'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index ix_migtest_e_basic_indextest6'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql index 5542a954f..95bd2ed00 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.4__dropsFor_1.3.sql @@ -43,7 +43,7 @@ alter table migtest_e_history5 add versioning use history table migtest_e_histor drop table migtest_e_user; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_USER_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_USER_SEQ') then prepare stmt from 'drop sequence migtest_e_user_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations index 9d4b61aa7..d3f9fa760 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations @@ -1,7 +1,7 @@ -1519091511, 1.0__initial.sql --370964456, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql -591329540, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +-1557025581, 1.1.sql +-1405930325, 1.2__dropsFor_1.1.sql +-1928774481, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql index 2fb812410..c874d6de8 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql @@ -2,77 +2,77 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST2') then prepare stmt from 'drop index uq_migtest_e_basic_indextest2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index uq_migtest_e_basic_indextest6'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST1') then prepare stmt from 'drop index ix_migtest_e_basic_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index ix_migtest_e_basic_indextest5'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql index 7f78aa9b3..0e29ac8b4 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql @@ -18,7 +18,7 @@ alter table migtest_e_history2 add versioning use history table migtest_e_histor drop table migtest_e_ref; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_REF_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_REF_SEQ') then prepare stmt from 'drop sequence migtest_e_ref_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql index 9dbb719d6..f2b1f1f55 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql @@ -2,147 +2,147 @@ -- drop dependencies delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and tabname = 'MIGTEST_CKEY_DETAIL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_CKEY_DETAIL_PARENT' and ucase(tabname) = 'MIGTEST_CKEY_DETAIL') then prepare stmt from 'alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and tabname = 'MIGTEST_FK_CASCADE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_CASCADE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_CASCADE') then prepare stmt from 'alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_ONE_ID' and tabname = 'MIGTEST_FK_NONE') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE') then prepare stmt from 'alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and tabname = 'MIGTEST_FK_NONE_VIA_JOIN') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_NONE_VIA_JOIN_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_NONE_VIA_JOIN') then prepare stmt from 'alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and tabname = 'MIGTEST_FK_SET_NULL') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_FK_SET_NULL_ONE_ID' and ucase(tabname) = 'MIGTEST_FK_SET_NULL') then prepare stmt from 'alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_BASIC_STATUS2' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_BASIC_STATUS2' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_description'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_DESCRIPTION') then prepare stmt from 'drop index uq_migtest_e_basic_description'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'FK_MIGTEST_E_BASIC_USER_ID' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'FK_MIGTEST_E_BASIC_USER_ID' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_STATUS_INDEXTEST1') then prepare stmt from 'drop index uq_migtest_e_basic_status_indextest1'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_NAME' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_NAME' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_name'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_NAME') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_NAME') then prepare stmt from 'drop index uq_migtest_e_basic_name'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST4') then prepare stmt from 'drop index uq_migtest_e_basic_indextest4'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and tabname = 'MIGTEST_E_BASIC') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5' and ucase(tabname) = 'MIGTEST_E_BASIC') then prepare stmt from 'alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$ delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'UQ_MIGTEST_E_BASIC_INDEXTEST5') then prepare stmt from 'drop index uq_migtest_e_basic_indextest5'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select constname from syscat.tabconst where tabschema = current_schema and constname = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and tabname = 'MIGTEST_E_ENUM') then +if exists (select constname from syscat.tabconst where tabschema = current_schema and ucase(constname) = 'CK_MIGTEST_E_ENUM_TEST_STATUS' and ucase(tabname) = 'MIGTEST_E_ENUM') then prepare stmt from 'alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST3') then prepare stmt from 'drop index ix_migtest_e_basic_indextest3'; execute stmt; end if; end$$; delimiter $$ begin -if exists (select indname from syscat.indexes where indschema = current_schema and indname = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_E_BASIC_INDEXTEST6') then prepare stmt from 'drop index ix_migtest_e_basic_indextest6'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql index 5542a954f..95bd2ed00 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.4__dropsFor_1.3.sql @@ -43,7 +43,7 @@ alter table migtest_e_history5 add versioning use history table migtest_e_histor drop table migtest_e_user; delimiter $$ begin -if exists (select seqschema from syscat.sequences where seqschema = current_schema and seqname = 'MIGTEST_E_USER_SEQ') then +if exists (select seqschema from syscat.sequences where seqschema = current_schema and ucase(seqname) = 'MIGTEST_E_USER_SEQ') then prepare stmt from 'drop sequence migtest_e_user_seq'; execute stmt; end if; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations index 9d4b61aa7..d3f9fa760 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations @@ -1,7 +1,7 @@ -1519091511, 1.0__initial.sql --370964456, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql -591329540, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +-1557025581, 1.1.sql +-1405930325, 1.2__dropsFor_1.1.sql +-1928774481, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql From f1950d479e2bc2ff32266ba278930c61af78a36b Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 22 Mar 2022 10:43:34 +0100 Subject: [PATCH 03/17] Added testcase with upper and lower case characters --- .../dbmigration/DbMigrationTest.java | 90 ++++++++++++------- .../java/misc/migration/v1_0/EQuoted.java | 35 ++++++++ .../java/misc/migration/v1_2/EQuoted.java | 35 ++++++++ .../dbmigration/clickhouse/1.0__initial.sql | 6 ++ .../clickhouse/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/clickhouse/1.3.sql | 6 ++ .../clickhouse/idx_clickhouse.migrations | 6 +- .../dbmigration/cockroach/1.0__initial.sql | 11 +++ .../dbmigration/cockroach/1.1.sql | 1 + .../cockroach/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/cockroach/1.3.sql | 11 +++ .../cockroach/idx_cockroach.migrations | 8 +- .../dbmigration/db2fori/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/db2fori/1.1.sql | 7 ++ .../dbmigration/db2fori/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/db2fori/1.3.sql | 11 +++ .../dbmigration/db2fori/idx_db2.migrations | 8 +- .../dbmigration/db2legacy/1.0__initial.sql | 11 +++ .../dbmigration/db2legacy/1.1.sql | 7 ++ .../db2legacy/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/db2legacy/1.3.sql | 11 +++ .../dbmigration/db2legacy/idx_db2.migrations | 8 +- .../dbmigration/db2luw/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/db2luw/1.1.sql | 7 ++ .../dbmigration/db2luw/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/db2luw/1.3.sql | 11 +++ .../dbmigration/db2luw/idx_db2.migrations | 8 +- .../dbmigration/db2zos/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/db2zos/1.1.sql | 7 ++ .../dbmigration/db2zos/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/db2zos/1.3.sql | 11 +++ .../dbmigration/db2zos/idx_db2.migrations | 8 +- .../dbmigration/generic/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/generic/1.1.sql | 1 + .../dbmigration/generic/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/generic/1.3.sql | 11 +++ .../generic/idx_generic.migrations | 8 +- .../dbmigration/h2/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/h2/1.1.sql | 1 + .../dbmigration/h2/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/h2/1.3.sql | 11 +++ .../dbmigration/h2/idx_h2.migrations | 8 +- .../dbmigration/hana/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/hana/1.1.sql | 7 ++ .../dbmigration/hana/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/hana/1.3.sql | 11 +++ .../dbmigration/hana/idx_hana.migrations | 8 +- .../dbmigration/hsqldb/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/hsqldb/1.1.sql | 1 + .../dbmigration/hsqldb/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/hsqldb/1.3.sql | 11 +++ .../dbmigration/hsqldb/idx_hsqldb.migrations | 8 +- .../mariadb-noprocs/1.0__initial.sql | 9 ++ .../dbmigration/mariadb-noprocs/1.1.sql | 1 + .../mariadb-noprocs/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/mariadb-noprocs/1.3.sql | 9 ++ .../mariadb-noprocs/idx_mariadb.migrations | 8 +- .../dbmigration/mariadb/1.0__initial.sql | 9 ++ .../migrationtest/dbmigration/mariadb/1.1.sql | 1 + .../dbmigration/mariadb/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/mariadb/1.3.sql | 9 ++ .../mariadb/idx_mariadb.migrations | 8 +- .../dbmigration/model/1.0__initial.model.xml | 7 ++ .../dbmigration/model/1.1.model.xml | 2 + .../model/1.2__dropsFor_1.1.model.xml | 1 + .../dbmigration/model/1.3.model.xml | 7 ++ .../dbmigration/mysql/1.0__initial.sql | 9 ++ .../migrationtest/dbmigration/mysql/1.1.sql | 1 + .../dbmigration/mysql/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/mysql/1.3.sql | 9 ++ .../dbmigration/mysql/idx_mysql.migrations | 8 +- .../dbmigration/mysql55/1.0__initial.sql | 9 ++ .../migrationtest/dbmigration/mysql55/1.1.sql | 1 + .../dbmigration/mysql55/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/mysql55/1.3.sql | 9 ++ .../dbmigration/mysql55/idx_mysql.migrations | 8 +- .../dbmigration/nuodb/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/nuodb/1.1.sql | 1 + .../dbmigration/nuodb/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/nuodb/1.3.sql | 11 +++ .../dbmigration/nuodb/idx_nuodb.migrations | 8 +- .../dbmigration/oracle/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/oracle/1.1.sql | 1 + .../dbmigration/oracle/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/oracle/1.3.sql | 11 +++ .../dbmigration/oracle/idx_oracle.migrations | 8 +- .../dbmigration/oracle11/1.0__initial.sql | 11 +++ .../dbmigration/oracle11/1.1.sql | 1 + .../oracle11/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/oracle11/1.3.sql | 11 +++ .../oracle11/idx_oracle.migrations | 8 +- .../dbmigration/postgres/1.0__initial.sql | 11 +++ .../dbmigration/postgres/1.1.sql | 1 + .../postgres/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/postgres/1.3.sql | 11 +++ .../postgres/idx_postgres.migrations | 8 +- .../dbmigration/postgres9/1.0__initial.sql | 11 +++ .../dbmigration/postgres9/1.1.sql | 1 + .../postgres9/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/postgres9/1.3.sql | 11 +++ .../postgres9/idx_postgres.migrations | 8 +- .../dbmigration/sqlanywhere/1.0__initial.sql | 11 +++ .../dbmigration/sqlanywhere/1.1.sql | 1 + .../sqlanywhere/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/sqlanywhere/1.3.sql | 11 +++ .../sqlanywhere/idx_sqlanywhere.migrations | 8 +- .../dbmigration/sqlite/1.0__initial.sql | 11 +++ .../migrationtest/dbmigration/sqlite/1.1.sql | 1 + .../dbmigration/sqlite/1.2__dropsFor_1.1.sql | 1 + .../migrationtest/dbmigration/sqlite/1.3.sql | 11 +++ .../dbmigration/sqlite/idx_sqlite.migrations | 8 +- .../dbmigration/sqlserver16/1.0__initial.sql | 11 +++ .../dbmigration/sqlserver16/1.1.sql | 1 + .../sqlserver16/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/sqlserver16/1.3.sql | 11 +++ .../sqlserver16/idx_sqlserver.migrations | 8 +- .../dbmigration/sqlserver17/1.0__initial.sql | 11 +++ .../dbmigration/sqlserver17/1.1.sql | 1 + .../sqlserver17/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/sqlserver17/1.3.sql | 11 +++ .../sqlserver17/idx_sqlserver.migrations | 8 +- .../dbmigration/yugabyte/1.0__initial.sql | 11 +++ .../dbmigration/yugabyte/1.1.sql | 1 + .../yugabyte/1.2__dropsFor_1.1.sql | 1 + .../dbmigration/yugabyte/1.3.sql | 11 +++ .../yugabyte/idx_yugabyte.migrations | 8 +- 126 files changed, 820 insertions(+), 126 deletions(-) create mode 100644 ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java create mode 100644 ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java 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 a7461173e..b9c736b40 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -14,8 +14,10 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.net.URL; +import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -60,35 +62,38 @@ public class DbMigrationTest extends BaseTestCase { ((ConnectionPool)server().dataSource()).offline(); ((ConnectionPool)server().dataSource()).online(); cleanup("migtest_ckey_assoc", - "migtest_ckey_detail", - "migtest_ckey_parent", - "migtest_e_basic", - "migtest_e_enum", - "migtest_e_history", - "migtest_e_history2", - "migtest_e_history3", - "migtest_e_history4", - "migtest_e_history5", - "migtest_e_history6", - "migtest_e_ref", - "migtest_e_softdelete", - "migtest_e_user", - "migtest_fk_cascade", - "migtest_fk_cascade_one", - "migtest_fk_none", - "migtest_fk_none_via_join", - "migtest_fk_one", - "migtest_fk_set_null", - "migtest_mtm_c", - "migtest_mtm_m", - "migtest_mtm_m_phone_numbers", - "migtest_mtm_c_migtest_mtm_m", - "migtest_mtm_m_migtest_mtm_c", - "migtest_oto_child", - "migtest_oto_master", - "table", - "\"table\"", - "`table`"); + "migtest_ckey_detail", + "migtest_ckey_parent", + "migtest_e_basic", + "migtest_e_enum", + "migtest_e_history", + "migtest_e_history2", + "migtest_e_history3", + "migtest_e_history4", + "migtest_e_history5", + "migtest_e_history6", + "migtest_e_ref", + "migtest_e_softdelete", + "migtest_e_user", + "migtest_fk_cascade", + "migtest_fk_cascade_one", + "migtest_fk_none", + "migtest_fk_none_via_join", + "migtest_fk_one", + "migtest_fk_set_null", + "migtest_mtm_c", + "migtest_mtm_m", + "migtest_mtm_m_phone_numbers", + "migtest_mtm_c_migtest_mtm_m", + "migtest_mtm_m_migtest_mtm_c", + "migtest_oto_child", + "migtest_oto_master", + "`migtest_QuOtEd`", + "migtest_QuOtEd", + "\"migtest_QuOtEd\"", + "table", + "\"table\"", + "`table`"); ((ConnectionPool)server().dataSource()).offline(); ((ConnectionPool)server().dataSource()).online(); @@ -96,8 +101,17 @@ public class DbMigrationTest extends BaseTestCase { runScript("I__create_procs.sql"); } + if (!isOracle()) { + // oracle.getMetaData is too slow. So skip this test + assertThat(getTables()).doesNotContain("migtest_QuOtEd"); + } runScript("1.0__initial.sql"); - + if (!isOracle()) { + assertThat(getTables()) // we expect exact spelling here + .contains("migtest_QuOtEd") + .doesNotContain("migtest_quoted") + .doesNotContain("MIGTEST_QUOTED"); + } if (isClickHouse()) { // ClickHouse does not support transactions, so we cannot do update statements // Add column is also not implemented. So exit here @@ -160,7 +174,10 @@ public class DbMigrationTest extends BaseTestCase { return; } runScript("1.2__dropsFor_1.1.sql"); - + if (!isOracle()) { + // too slow! + assertThat(getTables()).doesNotContain("migtest_QuOtEd"); + } // Oracle caches the statement and does not detect schema change. It fails with // an ORA-01007 result = server().sqlQuery("select * from migtest_e_basic order by id,status").findList(); @@ -345,4 +362,15 @@ public class DbMigrationTest extends BaseTestCase { server().script().runScript("cleanup", sb.toString(), true); server().script().runScript("cleanup", sb.toString(), true); } + + private List getTables() throws SQLException { + List ret = new ArrayList<>(); + try (Transaction txn = server().beginTransaction()) { + ResultSet rs = txn.connection().getMetaData().getTables(null, null, null, null); + while (rs.next()) { + ret.add(rs.getString(3)); + } + } + return ret; + } } diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java new file mode 100644 index 000000000..116094997 --- /dev/null +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -0,0 +1,35 @@ +package misc.migration.v1_0; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + +// table with upper and lower case letters +@Table(name = "`migtest_QuOtEd`") +@Entity +public class EQuoted { + + public enum Status { + @EnumValue("N") + NEW, + + @EnumValue("A") + ACTIVE, + + @EnumValue("I") + INACTIVE, + } + + @Id + private String id; + + @Index + private Status status1; + + @Index(unique = true) + private Status status2; + +} diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java new file mode 100644 index 000000000..6832092bf --- /dev/null +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -0,0 +1,35 @@ +package misc.migration.v1_2; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + +//table with upper and lower case letters +@Table(name = "`migtest_QuOtEd`") +@Entity +public class EQuoted { + + public enum Status { + @EnumValue("N") + NEW, + + @EnumValue("A") + ACTIVE, + + @EnumValue("I") + INACTIVE, + } + + @Id + private String id; + + @Index + private Status status1; + + @Index(unique = true) + private Status status2; + +} diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql index 976eaa3cd..f98c28775 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.0__initial.sql @@ -105,6 +105,12 @@ create table migtest_e_history6 ( test_number2 UInt32 ) ENGINE = Log(); +create table "migtest_QuOtEd" ( + id String, + status1 String, + status2 String +) ENGINE = Log(); + create table migtest_e_ref ( id UInt32, name String diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql index 4ec79a34c..cb6860e63 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.2__dropsFor_1.1.sql @@ -7,4 +7,5 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql index 1d1e765bc..b36ae5ab1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/1.3.sql @@ -9,6 +9,12 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4; alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; -- apply changes +create table "migtest_QuOtEd" ( + id String, + status1 String, + status2 String +) ENGINE = Log(); + create table migtest_e_ref ( id UInt32, name String diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations index e6e04dafd..2827022f5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/clickhouse/idx_clickhouse.migrations @@ -1,6 +1,6 @@ -863321871, 1.0__initial.sql +235371332, 1.0__initial.sql 1903846331, 1.1.sql -1279151426, 1.2__dropsFor_1.1.sql -1630693278, 1.3.sql +688811494, 1.2__dropsFor_1.1.sql +1015552567, 1.3.sql 80209848, 1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql index faa10a8c2..71fc29b04 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -190,4 +200,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql index 785bcda3a..61a412b39 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.1.sql @@ -9,6 +9,7 @@ drop index uq_migtest_e_basic_indextest6 cascade; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql index e3450aa6a..44f13ac12 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.2__dropsFor_1.1.sql @@ -7,5 +7,6 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd" cascade; drop table if exists migtest_e_ref cascade; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql index 510820e7b..8397edb71 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -71,3 +81,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations index 69de34b1f..71060fe76 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/cockroach/idx_cockroach.migrations @@ -1,7 +1,7 @@ -1636200128, 1.0__initial.sql -356413151, 1.1.sql -240919209, 1.2__dropsFor_1.1.sql --430000356, 1.3.sql +-703764770, 1.0__initial.sql +751308758, 1.1.sql +856096334, 1.2__dropsFor_1.1.sql +17665322, 1.3.sql -820814009, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql index a64383897..1d843f226 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql @@ -125,6 +125,15 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -209,6 +218,7 @@ create table migtest_e_history5_history as (select * from migtest_e_history5) wi alter table migtest_e_history5 add versioning use history table migtest_e_history5_history; create table migtest_e_history6_history as (select * from migtest_e_history6) with no data; alter table migtest_e_history6 add versioning use history table migtest_e_history6_history; +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); create unique index uq_table_to on "table"("to") exclude null keys; create unique index uq_table_varchar on "table"("varchar") exclude null keys; @@ -229,4 +239,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql index 56fde4bef..3cc6acf66 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql @@ -77,6 +77,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a execute stmt; end if; end$$; +delimiter $$ +begin +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_QUOTED_STATUS1') then + prepare stmt from 'drop index ix_migtest_quoted_status1'; + execute stmt; +end if; +end$$; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql index 0e29ac8b4..28b8850d6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.2__dropsFor_1.1.sql @@ -15,6 +15,7 @@ alter table migtest_e_history2_history drop column obsolete_string2; call sysproc.admin_cmd('reorg table migtest_e_history2_history'); -- apply post alter alter table migtest_e_history2 add versioning use history table migtest_e_history2_history; +drop table "migtest_QuOtEd"; drop table migtest_e_ref; delimiter $$ begin diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql index e87e0474f..0e3646340 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql @@ -148,6 +148,15 @@ if exists (select indname from syscat.indexes where indschema = current_schema a end if; end$$; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -205,6 +214,7 @@ alter table migtest_e_history6_history alter column test_number1 drop not null; alter table migtest_e_history6_history alter column test_number2 set not null; call sysproc.admin_cmd('reorg table migtest_e_history6_history'); -- apply post alter +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); @@ -226,3 +236,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations index f354bfaff..198dd94a3 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations @@ -1,7 +1,7 @@ --1073246286, 1.0__initial.sql -1098680715, 1.1.sql --1405930325, 1.2__dropsFor_1.1.sql -2071169682, 1.3.sql +-527393880, 1.0__initial.sql +-13325084, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +1482397777, 1.3.sql -1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql index 578d7cdff..c5122d691 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql @@ -125,6 +125,15 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_mgtst_qtd_stts1 check ( status1 in ('N','A','I')), + constraint ck_mgtst_qtd_stts2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -209,6 +218,7 @@ create table migtest_e_history5_history as (select * from migtest_e_history5) wi alter table migtest_e_history5 add versioning use history table migtest_e_history5_history; create table migtest_e_history6_history as (select * from migtest_e_history6) with no data; alter table migtest_e_history6 add versioning use history table migtest_e_history6_history; +create unique index uq_mgtst_qtd_stts2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_mgtst__rf_nm unique (name); create unique index uq_table_to on "table"("to") exclude null keys; create unique index uq_table_varchar on "table"("varchar") exclude null keys; @@ -229,4 +239,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1); create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5); +create index ix_mgtst_qtd_stts1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql index 109316b0a..eff8f6df9 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql @@ -77,6 +77,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a execute stmt; end if; end$$; +delimiter $$ +begin +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MGTST_QTD_STTS1') then + prepare stmt from 'drop index ix_mgtst_qtd_stts1'; + execute stmt; +end if; +end$$; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql index 0e29ac8b4..28b8850d6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.2__dropsFor_1.1.sql @@ -15,6 +15,7 @@ alter table migtest_e_history2_history drop column obsolete_string2; call sysproc.admin_cmd('reorg table migtest_e_history2_history'); -- apply post alter alter table migtest_e_history2 add versioning use history table migtest_e_history2_history; +drop table "migtest_QuOtEd"; drop table migtest_e_ref; delimiter $$ begin diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql index aae7b02c8..f2b61221e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql @@ -148,6 +148,15 @@ if exists (select indname from syscat.indexes where indschema = current_schema a end if; end$$; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_mgtst_qtd_stts1 check ( status1 in ('N','A','I')), + constraint ck_mgtst_qtd_stts2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -205,6 +214,7 @@ alter table migtest_e_history6_history alter column test_number1 drop not null; alter table migtest_e_history6_history alter column test_number2 set not null; call sysproc.admin_cmd('reorg table migtest_e_history6_history'); -- apply post alter +create unique index uq_mgtst_qtd_stts2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_mgtst__rf_nm unique (name); alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I')); @@ -226,3 +236,4 @@ alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_ create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1); create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5); +create index ix_mgtst_qtd_stts1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations index dfe6ba557..7aa700570 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations @@ -1,7 +1,7 @@ -2054922533, 1.0__initial.sql -1340888486, 1.1.sql --1405930325, 1.2__dropsFor_1.1.sql -923642558, 1.3.sql +-1919802090, 1.0__initial.sql +142879086, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +214437961, 1.3.sql -1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql index c2235d9c9..7d9b5754b 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql @@ -125,6 +125,15 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -209,6 +218,7 @@ create table migtest_e_history5_history as (select * from migtest_e_history5) wi alter table migtest_e_history5 add versioning use history table migtest_e_history5_history; create table migtest_e_history6_history as (select * from migtest_e_history6) with no data; alter table migtest_e_history6 add versioning use history table migtest_e_history6_history; +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); create unique index uq_table_to on "table"("to") exclude null keys; create unique index uq_table_varchar on "table"("varchar") exclude null keys; @@ -229,4 +239,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql index c874d6de8..1a42e7997 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql @@ -77,6 +77,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a execute stmt; end if; end$$; +delimiter $$ +begin +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_QUOTED_STATUS1') then + prepare stmt from 'drop index ix_migtest_quoted_status1'; + execute stmt; +end if; +end$$; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql index 0e29ac8b4..28b8850d6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.2__dropsFor_1.1.sql @@ -15,6 +15,7 @@ alter table migtest_e_history2_history drop column obsolete_string2; call sysproc.admin_cmd('reorg table migtest_e_history2_history'); -- apply post alter alter table migtest_e_history2 add versioning use history table migtest_e_history2_history; +drop table "migtest_QuOtEd"; drop table migtest_e_ref; delimiter $$ begin diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql index f2b1f1f55..204fe89b0 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql @@ -148,6 +148,15 @@ if exists (select indname from syscat.indexes where indschema = current_schema a end if; end$$; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -205,6 +214,7 @@ alter table migtest_e_history6_history alter column test_number1 drop not null; alter table migtest_e_history6_history alter column test_number2 set not null; call sysproc.admin_cmd('reorg table migtest_e_history6_history'); -- apply post alter +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); @@ -226,3 +236,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations index d3f9fa760..a8ea87a5e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations @@ -1,7 +1,7 @@ --1519091511, 1.0__initial.sql --1557025581, 1.1.sql --1405930325, 1.2__dropsFor_1.1.sql --1928774481, 1.3.sql +1215388873, 1.0__initial.sql +301356990, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +1289702979, 1.3.sql -1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql index c2235d9c9..7d9b5754b 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql @@ -125,6 +125,15 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -209,6 +218,7 @@ create table migtest_e_history5_history as (select * from migtest_e_history5) wi alter table migtest_e_history5 add versioning use history table migtest_e_history5_history; create table migtest_e_history6_history as (select * from migtest_e_history6) with no data; alter table migtest_e_history6 add versioning use history table migtest_e_history6_history; +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); create unique index uq_table_to on "table"("to") exclude null keys; create unique index uq_table_varchar on "table"("varchar") exclude null keys; @@ -229,4 +239,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql index c874d6de8..1a42e7997 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql @@ -77,6 +77,13 @@ if exists (select indname from syscat.indexes where indschema = current_schema a execute stmt; end if; end$$; +delimiter $$ +begin +if exists (select indname from syscat.indexes where indschema = current_schema and ucase(indname) = 'IX_MIGTEST_QUOTED_STATUS1') then + prepare stmt from 'drop index ix_migtest_quoted_status1'; + execute stmt; +end if; +end$$; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql index 0e29ac8b4..28b8850d6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.2__dropsFor_1.1.sql @@ -15,6 +15,7 @@ alter table migtest_e_history2_history drop column obsolete_string2; call sysproc.admin_cmd('reorg table migtest_e_history2_history'); -- apply post alter alter table migtest_e_history2 add versioning use history table migtest_e_history2_history; +drop table "migtest_QuOtEd"; drop table migtest_e_ref; delimiter $$ begin diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql index f2b1f1f55..204fe89b0 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql @@ -148,6 +148,15 @@ if exists (select indname from syscat.indexes where indschema = current_schema a end if; end$$; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -205,6 +214,7 @@ alter table migtest_e_history6_history alter column test_number1 drop not null; alter table migtest_e_history6_history alter column test_number2 set not null; call sysproc.admin_cmd('reorg table migtest_e_history6_history'); -- apply post alter +create unique index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) exclude null keys; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); @@ -226,3 +236,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations index d3f9fa760..a8ea87a5e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations @@ -1,7 +1,7 @@ --1519091511, 1.0__initial.sql --1557025581, 1.1.sql --1405930325, 1.2__dropsFor_1.1.sql --1928774481, 1.3.sql +1215388873, 1.0__initial.sql +301356990, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +1289702979, 1.3.sql -1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql index 0ac3d868a..4deaeeaa5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -191,4 +201,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql index dc9bed0c0..10c455972 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql index 4ec79a34c..cb6860e63 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.2__dropsFor_1.1.sql @@ -7,4 +7,5 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql index ec207d6a4..ac80b64d5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -74,3 +84,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations index a6df69810..8dfa501f7 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/generic/idx_generic.migrations @@ -1,6 +1,6 @@ --1347475412, 1.0__initial.sql -2132717520, 1.1.sql -1279151426, 1.2__dropsFor_1.1.sql --796269364, 1.3.sql +-710189690, 1.0__initial.sql +1626063176, 1.1.sql +688811494, 1.2__dropsFor_1.1.sql +2025934113, 1.3.sql 80209848, 1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql index e3b222262..508177c05 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -265,4 +275,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql index f34c6996f..0936da80e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql index f3112c454..1037b7b67 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.2__dropsFor_1.1.sql @@ -14,5 +14,6 @@ alter table migtest_e_history2_history drop column obsolete_string2; -- apply post alter create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history; create trigger migtest_e_history2_history_upd before update,delete on migtest_e_history2 for each row call "io.ebean.config.dbplatform.h2.H2HistoryTrigger"; +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql index 80d4f9aa0..9ec4e5674 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -95,3 +105,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations index 7a87fc386..f32ee0de6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/h2/idx_h2.migrations @@ -1,7 +1,7 @@ --1179806373, 1.0__initial.sql -398205555, 1.1.sql --1366392410, 1.2__dropsFor_1.1.sql --523874424, 1.3.sql +-1826073043, 1.0__initial.sql +-132538485, 1.1.sql +-2064267391, 1.2__dropsFor_1.1.sql +-94686510, 1.3.sql -1382108238, 1.4__dropsFor_1.3.sql 783227075, R__multi_comments.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql index c0df03053..a6b08b371 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.0__initial.sql @@ -127,6 +127,16 @@ create column table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create column table "migtest_QuOtEd" ( + id nvarchar(255) not null, + status1 nvarchar(1), + status2 nvarchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create column table migtest_e_ref ( id integer generated by default as identity not null, name nvarchar(127) not null, @@ -271,4 +281,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe -- 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; +-- explicit index "ix_migtest_quoted_status1" for single column "status1" of table ""migtest_QuOtEd"" is not necessary; -- explicit index "ix_table_from" for single column ""from"" of table ""table"" is not necessary; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql index 8de138abb..c6c66676f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.1.sql @@ -51,6 +51,13 @@ declare exit handler for sql_error_code 261 begin end; exec 'drop index ix_migtest_e_basic_indextest5'; end; $$; +delimiter $$ +do +begin +declare exit handler for sql_error_code 261 begin end; +exec 'drop index ix_migtest_quoted_status1'; +end; +$$; -- apply changes create column table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql index 14a60d921..b5fe0f04f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.2__dropsFor_1.1.sql @@ -12,4 +12,5 @@ CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string1'); CALL usp_ebean_drop_column('migtest_e_history2_history', 'obsolete_string2'); -- apply post alter alter table migtest_e_history2 add system versioning history table migtest_e_history2_history not validated; +drop table "migtest_QuOtEd" cascade; drop table migtest_e_ref cascade; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql index b44e90abe..228ebaa58 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/1.3.sql @@ -77,6 +77,16 @@ exec 'drop index ix_migtest_e_basic_indextest6'; end; $$; -- apply changes +create column table "migtest_QuOtEd" ( + id nvarchar(255) not null, + status1 nvarchar(1), + status2 nvarchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create column table migtest_e_ref ( id integer generated by default as identity not null, name nvarchar(127) not null, @@ -141,3 +151,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke -- 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; +-- explicit index "ix_migtest_quoted_status1" for single column "status1" of table ""migtest_QuOtEd"" is not necessary; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations index b88d4fd3d..d08cf01f1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations @@ -1,8 +1,8 @@ -745347271, I__create_procs.sql -1934891896, 1.0__initial.sql -187688059, 1.1.sql -197547825, 1.2__dropsFor_1.1.sql --1989736027, 1.3.sql +1631114894, 1.0__initial.sql +-1483493637, 1.1.sql +1535221752, 1.2__dropsFor_1.1.sql +483907844, 1.3.sql 1812245353, 1.4__dropsFor_1.3.sql 1906063401, R__order_views_hana.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql index 47015f010..f84501c10 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity (start with 1) not null, name varchar(127) not null, @@ -191,4 +201,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql index 04d1379e5..f3e9c0192 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer generated by default as identity (start with 1) not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql index f33b6874f..eeb8a6a1c 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.2__dropsFor_1.1.sql @@ -7,5 +7,6 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql index 4658ed476..de92cd16f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity (start with 1) not null, name varchar(127) not null, @@ -74,3 +84,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations index 8cd03776b..4e2942e64 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/hsqldb/idx_hsqldb.migrations @@ -1,7 +1,7 @@ --917796012, 1.0__initial.sql --838725141, 1.1.sql --300925212, 1.2__dropsFor_1.1.sql --1549893170, 1.3.sql +-906026927, 1.0__initial.sql +135699844, 1.1.sql +-848622216, 1.2__dropsFor_1.1.sql +781720387, 1.3.sql -972999284, 1.4__dropsFor_1.3.sql 861001272, R__order_views_hsqldb.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql index 871dfe2de..be0dfa028 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.0__initial.sql @@ -124,6 +124,14 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -194,4 +202,5 @@ alter table `table` add constraint fk_table_foreign foreign key (`foreign`) refe 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_table_from on `table` (`from`); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql index a47607fa6..85849f0ff 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.1.sql @@ -6,6 +6,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2; alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6; drop index ix_migtest_e_basic_indextest1 on migtest_e_basic; drop index ix_migtest_e_basic_indextest5 on migtest_e_basic; +drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql index 52ed4e9c0..60699805e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.2__dropsFor_1.1.sql @@ -9,5 +9,6 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists `migtest_QuOtEd`; drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql index f0c10c5ed..fc633abc6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/1.3.sql @@ -14,6 +14,14 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5; drop index ix_migtest_e_basic_indextest3 on migtest_e_basic; drop index ix_migtest_e_basic_indextest6 on migtest_e_basic; -- apply changes +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -58,3 +66,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations index f94e6b123..c49cd375a 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb-noprocs/idx_mariadb.migrations @@ -1,7 +1,7 @@ -675320779, 1.0__initial.sql -840323734, 1.1.sql --828985759, 1.2__dropsFor_1.1.sql --1470028617, 1.3.sql +168258180, 1.0__initial.sql +-1449201260, 1.1.sql +919151678, 1.2__dropsFor_1.1.sql +-1031408459, 1.3.sql -446860935, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql index 871dfe2de..be0dfa028 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.0__initial.sql @@ -124,6 +124,14 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -194,4 +202,5 @@ alter table `table` add constraint fk_table_foreign foreign key (`foreign`) refe 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_table_from on `table` (`from`); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql index a47607fa6..85849f0ff 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.1.sql @@ -6,6 +6,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2; alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6; drop index ix_migtest_e_basic_indextest1 on migtest_e_basic; drop index ix_migtest_e_basic_indextest5 on migtest_e_basic; +drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql index 227ae4335..8d64a0804 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.2__dropsFor_1.1.sql @@ -9,5 +9,6 @@ CALL usp_ebean_drop_column('migtest_e_basic', 'eref_id'); CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string1'); CALL usp_ebean_drop_column('migtest_e_history2', 'obsolete_string2'); -- apply post alter +drop table if exists `migtest_QuOtEd`; drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql index f0c10c5ed..fc633abc6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/1.3.sql @@ -14,6 +14,14 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5; drop index ix_migtest_e_basic_indextest3 on migtest_e_basic; drop index ix_migtest_e_basic_indextest6 on migtest_e_basic; -- apply changes +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -58,3 +66,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations index 241588a15..3574d5edc 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations @@ -1,8 +1,8 @@ 1835064798, I__create_procs.sql -675320779, 1.0__initial.sql -840323734, 1.1.sql -2123392915, 1.2__dropsFor_1.1.sql --1470028617, 1.3.sql +168258180, 1.0__initial.sql +-1449201260, 1.1.sql +1187950993, 1.2__dropsFor_1.1.sql +-1031408459, 1.3.sql -692020559, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml index 001f3797f..00a03f3a6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml @@ -91,6 +91,12 @@ + + + + + + @@ -127,6 +133,7 @@ + diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml index 410615793..96f3353fe 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml @@ -103,6 +103,7 @@ + @@ -114,6 +115,7 @@ + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml index ff94a6767..99fa64365 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.2__dropsFor_1.1.model.xml @@ -7,6 +7,7 @@ + \ No newline at end of file diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml index 1c266ccae..a56a3f433 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml @@ -35,6 +35,12 @@ + + + + + + @@ -45,6 +51,7 @@ + diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql index 99d169187..bcd621077 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.0__initial.sql @@ -124,6 +124,14 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -321,4 +329,5 @@ alter table `table` add constraint fk_table_foreign foreign key (`foreign`) refe 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_table_from on `table` (`from`); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql index 566c73b8f..0f24ccc5f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.1.sql @@ -6,6 +6,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2; alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6; drop index ix_migtest_e_basic_indextest1 on migtest_e_basic; drop index ix_migtest_e_basic_indextest5 on migtest_e_basic; +drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql index 47dc655fd..2c06ee001 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.2__dropsFor_1.1.sql @@ -25,4 +25,5 @@ create trigger migtest_e_history2_history_del before delete on migtest_e_history insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column); end$$ unlock tables; +drop table if exists `migtest_QuOtEd`; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql index 611437b14..59325f7c9 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/1.3.sql @@ -14,6 +14,14 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5; drop index ix_migtest_e_basic_indextest3 on migtest_e_basic; drop index ix_migtest_e_basic_indextest6 on migtest_e_basic; -- apply changes +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -124,5 +132,6 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_m12_otoc72 on migtest_oto_child (name); create index ix_migtest_oto_master_name on migtest_oto_master (name); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations index d70a87087..ada5d352c 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations @@ -1,8 +1,8 @@ 1835064798, I__create_procs.sql -1464726622, 1.0__initial.sql -1321178229, 1.1.sql --1332434945, 1.2__dropsFor_1.1.sql --105506677, 1.3.sql +-1894322966, 1.0__initial.sql +718635669, 1.1.sql +-1097227916, 1.2__dropsFor_1.1.sql +-1972055805, 1.3.sql 379252952, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql index 72f4c0ebf..57e31e712 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.0__initial.sql @@ -124,6 +124,14 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -321,4 +329,5 @@ alter table `table` add constraint fk_table_foreign foreign key (`foreign`) refe 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_table_from on `table` (`from`); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql index 566c73b8f..0f24ccc5f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.1.sql @@ -6,6 +6,7 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest2; alter table migtest_e_basic drop index uq_migtest_e_basic_indextest6; drop index ix_migtest_e_basic_indextest1 on migtest_e_basic; drop index ix_migtest_e_basic_indextest5 on migtest_e_basic; +drop index ix_migtest_quoted_status1 on `migtest_QuOtEd`; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql index 47dc655fd..2c06ee001 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.2__dropsFor_1.1.sql @@ -25,4 +25,5 @@ create trigger migtest_e_history2_history_del before delete on migtest_e_history insert into migtest_e_history2_history (sys_period_start,sys_period_end,id, test_string, test_string3, new_column) values (OLD.sys_period_start, now(6),OLD.id, OLD.test_string, OLD.test_string3, OLD.new_column); end$$ unlock tables; +drop table if exists `migtest_QuOtEd`; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql index 611437b14..59325f7c9 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/1.3.sql @@ -14,6 +14,14 @@ alter table migtest_e_basic drop index uq_migtest_e_basic_indextest5; drop index ix_migtest_e_basic_indextest3 on migtest_e_basic; drop index ix_migtest_e_basic_indextest6 on migtest_e_basic; -- apply changes +create table `migtest_QuOtEd` ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -124,5 +132,6 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on `migtest_QuOtEd` (status1); create index ix_m12_otoc72 on migtest_oto_child (name); create index ix_migtest_oto_master_name on migtest_oto_master (name); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations index 0bdf6e4dc..29b7558c7 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations @@ -1,8 +1,8 @@ 1835064798, I__create_procs.sql -782176262, 1.0__initial.sql -1321178229, 1.1.sql --1332434945, 1.2__dropsFor_1.1.sql --105506677, 1.3.sql +955526296, 1.0__initial.sql +718635669, 1.1.sql +-1097227916, 1.2__dropsFor_1.1.sql +-1972055805, 1.3.sql 379252952, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql index b9c859753..02cb7f494 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -336,4 +346,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql index 7fff62c51..bd20899e8 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql index 092105623..fc0eb25e3 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.2__dropsFor_1.1.sql @@ -27,5 +27,6 @@ create or replace trigger migtest_e_history2_history_del for migtest_e_history2 end_trigger; $$ +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql index 7362489e6..53837ffc5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -144,3 +154,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations index 51fdb15a3..5dcecaa58 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/nuodb/idx_nuodb.migrations @@ -1,7 +1,7 @@ --357978944, 1.0__initial.sql -1244774121, 1.1.sql --424253630, 1.2__dropsFor_1.1.sql --1988156517, 1.3.sql +-355978970, 1.0__initial.sql +-1099441011, 1.1.sql +1530685455, 1.2__dropsFor_1.1.sql +1263834751, 1.3.sql -1189704269, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql index 02c9883f7..ced9cf2cd 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar2(255) not null, + status1 varchar2(1), + status2 varchar2(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id number(10) generated by default as identity not null, name varchar2(127) not null, @@ -191,4 +201,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql index 2dc2c5aff..7387c82f9 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.1.sql @@ -54,6 +54,7 @@ end; $$; drop index ix_migtest_e_basic_indextest1; drop index ix_migtest_e_basic_indextest5; +drop index ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id number(10) generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql index ccecef36d..e3b0dbb96 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.2__dropsFor_1.1.sql @@ -7,6 +7,7 @@ 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_QuOtEd" cascade constraints purge; drop table migtest_e_ref cascade constraints purge; delimiter $$ declare diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql index e84773a9b..14204acde 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/1.3.sql @@ -89,6 +89,16 @@ $$; drop index ix_migtest_e_basic_indextest3; drop index ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar2(255) not null, + status1 varchar2(1), + status2 varchar2(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id number(10) generated by default as identity not null, name varchar2(127) not null, @@ -146,3 +156,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations index c00b2991b..838bd4330 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle/idx_oracle.migrations @@ -1,7 +1,7 @@ --2071028889, 1.0__initial.sql --1556388339, 1.1.sql --582436324, 1.2__dropsFor_1.1.sql --712179623, 1.3.sql +1374133214, 1.0__initial.sql +-1429935878, 1.1.sql +930172034, 1.2__dropsFor_1.1.sql +-1621367223, 1.3.sql 663051206, 1.4__dropsFor_1.3.sql 1357801733, R__oracle_only_views.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql index d978faf0e..aeb4dc5a7 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.0__initial.sql @@ -143,6 +143,16 @@ create table migtest_e_history6 ( ); create sequence migtest_e_history6_seq; +create table "migtest_QuOtEd" ( + id varchar2(255) not null, + status1 varchar2(1), + status2 varchar2(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id number(10) not null, name varchar2(127) not null, @@ -213,4 +223,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql index ef694fac8..b3e4d8d99 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.1.sql @@ -54,6 +54,7 @@ end; $$; drop index ix_migtest_e_basic_indextest1; drop index ix_migtest_e_basic_indextest5; +drop index ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id number(10) not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql index ccecef36d..e3b0dbb96 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.2__dropsFor_1.1.sql @@ -7,6 +7,7 @@ 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_QuOtEd" cascade constraints purge; drop table migtest_e_ref cascade constraints purge; delimiter $$ declare diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql index 5c7882368..97091b812 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/1.3.sql @@ -89,6 +89,16 @@ $$; drop index ix_migtest_e_basic_indextest3; drop index ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar2(255) not null, + status1 varchar2(1), + status2 varchar2(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id number(10) not null, name varchar2(127) not null, @@ -147,3 +157,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations index 09ea3293a..b2f708a10 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/oracle11/idx_oracle.migrations @@ -1,7 +1,7 @@ --1110489114, 1.0__initial.sql -1800537955, 1.1.sql --582436324, 1.2__dropsFor_1.1.sql --253819510, 1.3.sql +1070168506, 1.0__initial.sql +984602561, 1.1.sql +930172034, 1.2__dropsFor_1.1.sql +-144959080, 1.3.sql 663051206, 1.4__dropsFor_1.3.sql 1357801733, R__oracle_only_views.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql index 65e967ce4..25f82c76d 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -349,6 +359,7 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index if not exists ix_table_from on "table" ("from"); 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); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql index b513afc92..c4c66c2d5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; drop index if exists idxd_migtest_0; drop index concurrently if exists ix_migtest_oto_child_lowername_id; drop index if exists ix_migtest_oto_child_lowername; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql index a9fef454c..7e6c96228 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.2__dropsFor_1.1.sql @@ -37,5 +37,6 @@ create trigger migtest_e_history2_history_upd before update or delete on migtest_e_history2 for each row execute procedure migtest_e_history2_history_version(); +drop table if exists "migtest_QuOtEd" cascade; drop table if exists migtest_e_ref cascade; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql index 7ce64dc07..585f3ffb6 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -187,6 +197,7 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); 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)); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations index c226913cb..7f9a10350 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres/idx_postgres.migrations @@ -1,7 +1,7 @@ --1738052304, 1.0__initial.sql -376807442, 1.1.sql --1098989118, 1.2__dropsFor_1.1.sql -691388965, 1.3.sql +1014378814, 1.0__initial.sql +-2047324426, 1.1.sql +-261111052, 1.2__dropsFor_1.1.sql +1335621453, 1.3.sql 1729345905, 1.4__dropsFor_1.3.sql 783227075, R__multi_comments.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql index c07f369a7..e319a8737 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id serial not null, name varchar(127) not null, @@ -349,6 +359,7 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index if not exists ix_table_from on "table" ("from"); 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); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql index 506c0fd73..7ec02b634 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; drop index if exists idxd_migtest_0; drop index concurrently if exists ix_migtest_oto_child_lowername_id; drop index if exists ix_migtest_oto_child_lowername; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql index a9fef454c..7e6c96228 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.2__dropsFor_1.1.sql @@ -37,5 +37,6 @@ create trigger migtest_e_history2_history_upd before update or delete on migtest_e_history2 for each row execute procedure migtest_e_history2_history_version(); +drop table if exists "migtest_QuOtEd" cascade; drop table if exists migtest_e_ref cascade; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql index 96a61e00a..401b5a211 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id serial not null, name varchar(127) not null, @@ -187,6 +197,7 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); 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)); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations index d3179797a..3ed7fcf1d 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/postgres9/idx_postgres.migrations @@ -1,7 +1,7 @@ -1809459793, 1.0__initial.sql --533983703, 1.1.sql --1098989118, 1.2__dropsFor_1.1.sql -376154634, 1.3.sql +382349675, 1.0__initial.sql +-606251140, 1.1.sql +-261111052, 1.2__dropsFor_1.1.sql +-893728811, 1.3.sql 1729345905, 1.4__dropsFor_1.3.sql 783227075, R__multi_comments.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql index 40060b094..6f14a9835 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -191,4 +201,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql index 2541938d3..77d47122f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer auto_increment not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql index 4ec79a34c..cb6860e63 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.2__dropsFor_1.1.sql @@ -7,4 +7,5 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql index 384260c79..e028819d5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer auto_increment not null, name varchar(127) not null, @@ -74,3 +84,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations index ea4b69483..332ef94bd 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlanywhere/idx_sqlanywhere.migrations @@ -1,6 +1,6 @@ -322064344, 1.0__initial.sql -1152745318, 1.1.sql -1279151426, 1.2__dropsFor_1.1.sql --1467142599, 1.3.sql +736698620, 1.0__initial.sql +-2028417735, 1.1.sql +688811494, 1.2__dropsFor_1.1.sql +-2020328769, 1.3.sql 80209848, 1.4__dropsFor_1.3.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql index 446fda37e..0c2e27345 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.0__initial.sql @@ -130,6 +130,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer not null, name varchar(127) not null, @@ -182,4 +192,5 @@ create table migtest_oto_master ( -- foreign keys and indices 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql index 1b1d797e6..817a25a1a 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.1.sql @@ -9,6 +9,7 @@ -- not supported: alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql index 4ec79a34c..cb6860e63 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.2__dropsFor_1.1.sql @@ -7,4 +7,5 @@ alter table migtest_e_basic drop column eref_id; alter table migtest_e_history2 drop column obsolete_string1; alter table migtest_e_history2 drop column obsolete_string2; -- apply post alter +drop table if exists "migtest_QuOtEd"; drop table if exists migtest_e_ref; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql index 0b0f96b0b..01458d882 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/1.3.sql @@ -17,6 +17,16 @@ drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer not null, name varchar(127) not null, @@ -70,3 +80,4 @@ create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_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); +create index ix_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations index 75273e48d..6be96bfdf 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlite/idx_sqlite.migrations @@ -1,7 +1,7 @@ -587945719, 1.0__initial.sql --752421071, 1.1.sql -1279151426, 1.2__dropsFor_1.1.sql -18475685, 1.3.sql +346470730, 1.0__initial.sql +-494516322, 1.1.sql +688811494, 1.2__dropsFor_1.1.sql +1092030960, 1.3.sql 80209848, 1.4__dropsFor_1.3.sql 2034589659, R__order_views_sqlite.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql index 0ceba76cc..756c7bce8 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.0__initial.sql @@ -125,6 +125,15 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table [migtest_QuOtEd] ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer identity(1,1) not null, name varchar(127) not null, @@ -198,6 +207,7 @@ alter table migtest_e_history6 sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', period for system_time (sys_periodFrom, sys_periodTo); alter table migtest_e_history6 set (system_versioning = on (history_table=dbo.migtest_e_history6_history)); +create unique nonclustered index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) where status2 is not null; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); create unique nonclustered index uq_table_to on "table"("to") where "to" is not null; create unique nonclustered index uq_table_varchar on "table"("varchar") where "varchar" is not null; @@ -221,4 +231,5 @@ alter table [table] add constraint fk_table_foreign foreign key ([foreign]) refe 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_migtest_quoted_status1 on [migtest_QuOtEd] (status1); create index ix_table_from on [table] ([from]); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql index 7552a3c6b..c49d94bba 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.1.sql @@ -11,6 +11,7 @@ IF OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL alter table migt IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('"migtest_QuOtEd"','U') AND name = 'ix_migtest_quoted_status1') drop index ix_migtest_quoted_status1 ON "migtest_QuOtEd"; -- apply changes create table migtest_e_user ( id integer identity(1,1) not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql index 36fa8d503..e37f34d7c 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.2__dropsFor_1.1.sql @@ -11,5 +11,6 @@ EXEC usp_ebean_drop_column migtest_e_basic, eref_id; EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string1; EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string2; -- apply post alter +IF OBJECT_ID('"migtest_QuOtEd"', 'U') IS NOT NULL drop table "migtest_QuOtEd"; IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref; IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql index 2fde6f6da..7802b1395 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/1.3.sql @@ -22,6 +22,15 @@ IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migte IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic; -- apply changes +create table [migtest_QuOtEd] ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer identity(1,1) not null, name varchar(127) not null, @@ -76,6 +85,7 @@ EXEC usp_ebean_drop_default_constraint migtest_e_history6, test_number2; alter table migtest_e_history6 alter column test_number2 integer not null; alter table migtest_e_history6 add default 7 for test_number2; -- apply post alter +create unique nonclustered index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) where status2 is not null; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); @@ -90,3 +100,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on [migtest_QuOtEd] (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations index 0e3158837..ebfba40ea 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver16/idx_sqlserver.migrations @@ -1,8 +1,8 @@ -2122378240, I__create_procs.sql --177269726, 1.0__initial.sql -708685501, 1.1.sql --1687762822, 1.2__dropsFor_1.1.sql -155669224, 1.3.sql +-1324388010, 1.0__initial.sql +1826995096, 1.1.sql +-1431095657, 1.2__dropsFor_1.1.sql +-2048567958, 1.3.sql -410961452, 1.4__dropsFor_1.3.sql 1607822082, R__order_views_mssql.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql index df8c1c702..caf403e9b 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.0__initial.sql @@ -141,6 +141,15 @@ create table migtest_e_history6 ( ); create sequence migtest_e_history6_seq as bigint start with 1; +create table [migtest_QuOtEd] ( + id nvarchar(255) not null, + status1 nvarchar(1), + status2 nvarchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer not null, name nvarchar(127) not null, @@ -220,6 +229,7 @@ alter table migtest_e_history6 sys_periodTo datetime2 GENERATED ALWAYS AS ROW END NOT NULL DEFAULT '9999-12-31T23:59:59.9999999', period for system_time (sys_periodFrom, sys_periodTo); alter table migtest_e_history6 set (system_versioning = on (history_table=dbo.migtest_e_history6_history)); +create unique nonclustered index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) where status2 is not null; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); create unique nonclustered index uq_table_to on "table"("to") where "to" is not null; create unique nonclustered index uq_table_varchar on "table"("varchar") where "varchar" is not null; @@ -243,4 +253,5 @@ alter table [table] add constraint fk_table_foreign foreign key ([foreign]) refe 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_migtest_quoted_status1 on [migtest_QuOtEd] (status1); create index ix_table_from on [table] ([from]); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql index 91fdef093..65587451a 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.1.sql @@ -11,6 +11,7 @@ IF OBJECT_ID('uq_migtest_e_basic_indextest6', 'UQ') IS NOT NULL alter table migt IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest1') drop index ix_migtest_e_basic_indextest1 ON migtest_e_basic; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest5') drop index ix_migtest_e_basic_indextest5 ON migtest_e_basic; +IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('"migtest_QuOtEd"','U') AND name = 'ix_migtest_quoted_status1') drop index ix_migtest_quoted_status1 ON "migtest_QuOtEd"; -- apply changes create table migtest_e_user ( id integer not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql index 36fa8d503..e37f34d7c 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.2__dropsFor_1.1.sql @@ -11,5 +11,6 @@ EXEC usp_ebean_drop_column migtest_e_basic, eref_id; EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string1; EXEC usp_ebean_drop_column migtest_e_history2, obsolete_string2; -- apply post alter +IF OBJECT_ID('"migtest_QuOtEd"', 'U') IS NOT NULL drop table "migtest_QuOtEd"; IF OBJECT_ID('migtest_e_ref', 'U') IS NOT NULL drop table migtest_e_ref; IF OBJECT_ID('migtest_e_ref_seq', 'SO') IS NOT NULL drop sequence migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql index de600ddb1..055b0d489 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/1.3.sql @@ -22,6 +22,15 @@ IF OBJECT_ID('ck_migtest_e_enum_test_status', 'C') IS NOT NULL alter table migte IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest3') drop index ix_migtest_e_basic_indextest3 ON migtest_e_basic; IF EXISTS (SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('migtest_e_basic','U') AND name = 'ix_migtest_e_basic_indextest6') drop index ix_migtest_e_basic_indextest6 ON migtest_e_basic; -- apply changes +create table [migtest_QuOtEd] ( + id nvarchar(255) not null, + status1 nvarchar(1), + status2 nvarchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer not null, name nvarchar(127) not null, @@ -77,6 +86,7 @@ EXEC usp_ebean_drop_default_constraint migtest_e_history6, test_number2; alter table migtest_e_history6 alter column test_number2 integer not null; alter table migtest_e_history6 add default 7 for test_number2; -- apply post alter +create unique nonclustered index uq_migtest_quoted_status2 on "migtest_QuOtEd"(status2) where status2 is not null; alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); @@ -91,3 +101,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on [migtest_QuOtEd] (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations index 0da8bb066..2e29648f1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/sqlserver17/idx_sqlserver.migrations @@ -1,8 +1,8 @@ -2122378240, I__create_procs.sql -1239366592, 1.0__initial.sql -1829437030, 1.1.sql --1687762822, 1.2__dropsFor_1.1.sql --476460378, 1.3.sql +2004279493, 1.0__initial.sql +848757422, 1.1.sql +-1431095657, 1.2__dropsFor_1.1.sql +294205466, 1.3.sql -410961452, 1.4__dropsFor_1.3.sql 1607822082, R__order_views_mssql.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql index 8cdb3c45a..91c6c6fc5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.0__initial.sql @@ -127,6 +127,16 @@ create table migtest_e_history6 ( constraint pk_migtest_e_history6 primary key (id) ); +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -379,4 +389,5 @@ alter table "table" add constraint fk_table_foreign foreign key ("foreign") refe 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); create index if not exists ix_table_from on "table" ("from"); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql index d9fa995a0..eb0a03e75 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.1.sql @@ -9,6 +9,7 @@ alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_status; drop index if exists ix_migtest_e_basic_indextest1; drop index if exists ix_migtest_e_basic_indextest5; +drop index if exists ix_migtest_quoted_status1; -- apply changes create table migtest_e_user ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql index a9fef454c..7e6c96228 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.2__dropsFor_1.1.sql @@ -37,5 +37,6 @@ create trigger migtest_e_history2_history_upd before update or delete on migtest_e_history2 for each row execute procedure migtest_e_history2_history_version(); +drop table if exists "migtest_QuOtEd" cascade; drop table if exists migtest_e_ref cascade; drop sequence if exists migtest_e_ref_seq; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql index 29fb9e62b..4b04c0cbb 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/1.3.sql @@ -17,6 +17,16 @@ alter table migtest_e_enum drop constraint if exists ck_migtest_e_enum_test_stat drop index if exists ix_migtest_e_basic_indextest3; drop index if exists ix_migtest_e_basic_indextest6; -- apply changes +create table "migtest_QuOtEd" ( + id varchar(255) not null, + status1 varchar(1), + status2 varchar(1), + constraint ck_migtest_quoted_status1 check ( status1 in ('N','A','I')), + constraint ck_migtest_quoted_status2 check ( status2 in ('N','A','I')), + constraint uq_migtest_quoted_status2 unique (status2), + constraint pk_migtest_quoted primary key (id) +); + create table migtest_e_ref ( id integer generated by default as identity not null, name varchar(127) not null, @@ -187,3 +197,4 @@ alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign ke 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_migtest_quoted_status1 on "migtest_QuOtEd" (status1); diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations index 05f50b829..ccba036e5 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/yugabyte/idx_yugabyte.migrations @@ -1,7 +1,7 @@ --967136529, 1.0__initial.sql --1547662237, 1.1.sql --1098989118, 1.2__dropsFor_1.1.sql -1877712595, 1.3.sql +1497343697, 1.0__initial.sql +1748254498, 1.1.sql +-261111052, 1.2__dropsFor_1.1.sql +-158984239, 1.3.sql 1729345905, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql From 3e4cc3b3d62ac6f15c725d4dca688e1ac19683ac Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 22 Mar 2022 11:15:07 +0100 Subject: [PATCH 04/17] Add tablespace support for DB2 --- ebean-api/pom.xml | 2 +- .../server/deploy/BeanDescriptor.java | 9 + .../server/deploy/TablespaceMeta.java | 59 ++ .../deploy/meta/DeployBeanDescriptor.java | 10 + .../server/deploy/parse/AnnotationClass.java | 14 + .../ddlgeneration/BaseDdlHandler.java | 8 + .../dbmigration/ddlgeneration/DdlHandler.java | 3 + .../dbmigration/ddlgeneration/TableDdl.java | 6 + .../ddlgeneration/platform/BaseTableDdl.java | 36 ++ .../ddlgeneration/platform/DB2Ddl.java | 16 + .../ddlgeneration/platform/Db2HistoryDdl.java | 15 +- .../platform/DbTriggerBasedHistoryDdl.java | 4 +- .../ddlgeneration/platform/DdlHelp.java | 13 + .../ddlgeneration/platform/PlatformDdl.java | 26 +- .../dbmigration/migration/AlterTable.java | 526 ++++++++++++++++++ .../dbmigration/migration/ChangeSet.java | 1 + .../dbmigration/migration/CreateTable.java | 22 + .../dbmigration/migration/ObjectFactory.java | 7 + .../dbmigration/model/MTable.java | 82 ++- .../dbmigration/model/ModelContainer.java | 32 ++ .../dbmigration/model/ModelDiff.java | 8 + .../model/build/ModelBuildElementTable.java | 2 +- .../build/ModelBuildIntersectionTable.java | 2 +- .../main/resources/ebean-dbmigration-1.0.xsd | 23 + .../ddlgeneration/BaseDdlHandlerTest.java | 17 + .../platform/PlatformDdl_CreateIndexTest.java | 22 + .../model/ModelContainerApplyTest.java | 5 +- .../test/java/io/localtest/BaseTestCase.java | 4 + .../resources/container/test-create-table.xml | 2 +- .../dbmigration/DbMigrationTest.java | 4 + .../test/java/misc/migration/v1_0/EBasic.java | 5 + .../java/misc/migration/v1_0/EHistory.java | 3 + .../test/java/misc/migration/v1_1/EBasic.java | 2 +- .../java/misc/migration/v1_1/EHistory.java | 3 + .../java/misc/migration/v1_1/MtmChild.java | 4 + .../java/misc/migration/v1_1/MtmMaster.java | 4 + .../java/misc/migration/v1_2/EHistory.java | 3 + ebean-test/src/test/resources/extra-ddl.xml | 37 ++ 38 files changed, 1014 insertions(+), 27 deletions(-) create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java create mode 100644 ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 5af204a63..addca9579 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -49,7 +49,7 @@ io.ebean ebean-annotation - 7.6 + 7.7 diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 761e2e3a5..81a326e79 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -121,6 +121,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { private final boolean softDelete; private final String draftTable; private final PartitionMeta partitionMeta; + private final TablespaceMeta tablespaceMeta; private final String storageEngine; private final String dbComment; private final boolean readAuditing; @@ -275,6 +276,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { this.dependentTables = deploy.getDependentTables(); this.dbComment = deploy.getDbComment(); this.partitionMeta = deploy.getPartitionMeta(); + this.tablespaceMeta = deploy.getTablespaceMeta(); this.storageEngine = deploy.getStorageEngine(); this.autoTunable = beanFinder == null && (entityType == EntityType.ORM || entityType == EntityType.VIEW); // helper object used to derive lists of properties @@ -2671,6 +2673,13 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public PartitionMeta partitionMeta() { return partitionMeta; } + + /** + * Return the tablespace details of the bean. + */ + public TablespaceMeta tablespaceMeta() { + return tablespaceMeta; + } /** * Return the storage engine. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java new file mode 100644 index 000000000..443a486bf --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java @@ -0,0 +1,59 @@ +package io.ebeaninternal.server.deploy; + +import java.util.Objects; + +/** + * Meta data for table spaces. If table space is configured, tablespaceName, indexTablespace, lobTablespace is never null; + * + * @author Noemi Szemenyei, FOCONIS AG + * + */ +public final class TablespaceMeta { + + private final String tablespaceName; + private final String indexTablespace; + private final String lobTablespace; + + public TablespaceMeta(String tablespaceName, String indexTablespace, String lobTablespace) { + this.tablespaceName = tablespaceName; + this.indexTablespace = indexTablespace; + this.lobTablespace = lobTablespace; + } + + public String getTablespaceName() { + return tablespaceName; + } + + public String getIndexTablespace() { + return indexTablespace; + } + + public String getLobTablespace() { + return lobTablespace; + } + + @Override + public int hashCode() { + return Objects.hash(indexTablespace, tablespaceName, lobTablespace); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + TablespaceMeta other = (TablespaceMeta) obj; + return Objects.equals(indexTablespace, other.indexTablespace) + && Objects.equals(tablespaceName, other.tablespaceName) + && Objects.equals(lobTablespace, other.lobTablespace); + } + + @Override + public String toString() { + return "tablespace=" + tablespaceName + ", indexTablespace=" + indexTablespace + ", lobTablespace=" + lobTablespace; + } + +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index effef1034..ac6c76c5a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -32,6 +32,7 @@ import io.ebeaninternal.server.deploy.IndexDefinition; import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.PartitionMeta; import io.ebeaninternal.server.deploy.TableJoin; +import io.ebeaninternal.server.deploy.TablespaceMeta; import io.ebeaninternal.server.deploy.parse.DeployBeanInfo; import io.ebeaninternal.server.idgen.UuidV1IdGenerator; import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator; @@ -135,6 +136,7 @@ public class DeployBeanDescriptor { private ChangeLogFilter changeLogFilter; private String dbComment; private PartitionMeta partitionMeta; + private TablespaceMeta tablespaceMeta; /** * One of NONE, INDEX or EMBEDDED. */ @@ -252,6 +254,14 @@ public class DeployBeanDescriptor { } return partitionMeta; } + + public void setTablespaceMeta(TablespaceMeta tablespaceMeta) { + this.tablespaceMeta = tablespaceMeta; + } + + public TablespaceMeta getTablespaceMeta() { + return tablespaceMeta; + } public void setDraftable() { draftable = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index cd015da92..8ca3058bd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -12,6 +12,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.InvalidateQueryCache; import io.ebean.annotation.ReadAudit; import io.ebean.annotation.StorageEngine; +import io.ebean.annotation.Tablespace; import io.ebean.annotation.View; import io.ebean.config.TableName; import io.ebeaninternal.api.CoreLog; @@ -19,6 +20,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType; import io.ebeaninternal.server.deploy.IndexDefinition; import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.PartitionMeta; +import io.ebeaninternal.server.deploy.TablespaceMeta; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import javax.persistence.AttributeOverride; @@ -154,6 +156,18 @@ final class AnnotationClass extends AnnotationParser { if (partition != null) { descriptor.setPartitionMeta(new PartitionMeta(partition.mode(), partition.property())); } + Tablespace tablespace = typeGet(cls, Tablespace.class); + if (tablespace != null) { + String indexTs = tablespace.index(); + if("".equals(indexTs)) { + indexTs = tablespace.value(); + } + String lobTs = tablespace.lob(); + if("".equals(lobTs)) { + lobTs = tablespace.value(); + } + descriptor.setTablespaceMeta(new TablespaceMeta(tablespace.value(), indexTs, lobTs)); + } Draftable draftable = typeGet(cls, Draftable.class); if (draftable != null) { descriptor.setDraftable(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java index a2f3f0e8e..afa3e0a89 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandler.java @@ -9,6 +9,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.CreateIndex; import io.ebeaninternal.dbmigration.migration.CreateTable; @@ -48,6 +49,8 @@ public class BaseDdlHandler implements DdlHandler { // ignore } else if (change instanceof DropTable) { generate(writer, (DropTable) change); + } else if (change instanceof AlterTable) { + generate(writer, (AlterTable) change); } else if (change instanceof AddTableComment) { generate(writer, (AddTableComment) change); } else if (change instanceof CreateIndex) { @@ -94,6 +97,11 @@ public class BaseDdlHandler implements DdlHandler { tableDdl.generate(writer, dropTable); } + @Override + public void generate(DdlWrite writer, AlterTable alterTable) { + tableDdl.generate(writer, alterTable); + } + @Override public void generate(DdlWrite writer, AddTableComment addTableComment) { tableDdl.generate(writer, addTableComment); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java index 5f4d31090..1090a8a24 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/DdlHandler.java @@ -6,6 +6,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.CreateIndex; import io.ebeaninternal.dbmigration.migration.CreateTable; @@ -24,6 +25,8 @@ public interface DdlHandler { void generate(DdlWrite writer, CreateTable createTable); void generate(DdlWrite writer, DropTable dropTable); + + void generate(DdlWrite writer, AlterTable dropTable); void generate(DdlWrite writer, AddTableComment addTableComment); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java index 744826a15..48143afe6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/TableDdl.java @@ -6,6 +6,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.CreateIndex; import io.ebeaninternal.dbmigration.migration.CreateTable; import io.ebeaninternal.dbmigration.migration.DropColumn; @@ -27,6 +28,11 @@ public interface TableDdl { * Write the drop column change. */ void generate(DdlWrite writer, DropTable dropTable); + + /** + * Write alter table changes. + */ + void generate(DdlWrite writer, AlterTable dropTable); /** * Write the add column change. diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java index 60b22552c..f000104fd 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java @@ -17,6 +17,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateIndex; import io.ebeaninternal.dbmigration.migration.CreateTable; @@ -236,6 +237,7 @@ public class BaseTableDdl implements TableDdl { writeInlineForeignKeys(apply, createTable); } apply.newLine().append(")"); + addTableTableSpaces(apply, createTable); addTableStorageEngine(apply, createTable); addTableCommentInline(apply, createTable); if (partitionMode != null) { @@ -267,6 +269,8 @@ public class BaseTableDdl implements TableDdl { } } + + private String sequenceName(CreateTable createTable, List pk) { return namingConvention.getSequenceName(createTable.getName(), pk.get(0).getName()); } @@ -288,6 +292,19 @@ public class BaseTableDdl implements TableDdl { } } + /** + * Add tablespace declaration. + */ + protected void addTableTableSpaces(DdlBuffer apply, CreateTable createTable) { + String tableSpace = platformDdl.extract(createTable.getTablespace()); + if (hasValue(tableSpace)) { + platformDdl.addTablespace(apply, + tableSpace, + platformDdl.extract(createTable.getIndexTablespace()), + platformDdl.extract(createTable.getLobTablespace())); + } + } + /** * Add the table storage engine clause. */ @@ -647,6 +664,25 @@ public class BaseTableDdl implements TableDdl { } } + /** + * Add table related changes to DDL (tableSpace,...) + */ + @Override + public void generate(DdlWrite writer, AlterTable alterTable) { + String tableSpace = platformDdl.extract(alterTable.getTablespace()); + String indexSpace = platformDdl.extract(alterTable.getIndexTablespace()); + String lobSpace = platformDdl.extract(alterTable.getLobTablespace()); + if (hasValue(tableSpace) + || hasValue(indexSpace) + || hasValue(lobSpace)) { + + writer.apply().appendStatement(platformDdl.alterTableTablespace(alterTable.getName(), + DdlHelp.toTablespace(tableSpace), + DdlHelp.toTablespace(indexSpace), + DdlHelp.toTablespace(lobSpace))); + } + } + /** * Add drop column DDL. */ diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java index b8ad7ca2d..e88c78a67 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java @@ -15,6 +15,7 @@ import io.ebeaninternal.dbmigration.migration.Column; * DB2 platform specific DDL. */ public class DB2Ddl extends PlatformDdl { + private static final String MOVE_TABLE = "CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'%s','%s','%s','%s','','','','','','MOVE')"; public DB2Ddl(DatabasePlatform platform) { super(platform); @@ -29,6 +30,16 @@ public class DB2Ddl extends PlatformDdl { this.historyDdl = new Db2HistoryDdl(); } + @Override + public String alterTableTablespace(String tablename, String tableSpace, String indexSpace, String lobSpace) { + if(tableSpace == null) { + // if no tableSpace set, use the default tablespace USERSPACE1 + return String.format(MOVE_TABLE, tablename.toUpperCase(), "USERSPACE1", "USERSPACE1", "USERSPACE1"); + } else { + return String.format(MOVE_TABLE, tablename.toUpperCase(), tableSpace, indexSpace, lobSpace); + } + } + @Override public String alterTableAddUniqueConstraint(String tableName, String uqName, String[] columns, String[] nullableColumns) { if (nullableColumns == null || nullableColumns.length == 0) { @@ -51,6 +62,11 @@ public class DB2Ddl extends PlatformDdl { return sb.toString(); } + @Override + public void addTablespace(DdlBuffer apply, String tablespaceName, String indexTablespace, String lobTablespace) { + apply.append(" in ").append(tablespaceName).append(" index in ").append(indexTablespace).append(" long in ").append(lobTablespace); + } + @Override public void alterTableAddColumn(DdlWrite writer, String tableName, Column column, boolean onHistoryTable, String defaultValue) { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java index 17855e8fa..fa11e4899 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Db2HistoryDdl.java @@ -40,9 +40,20 @@ public class Db2HistoryDdl implements PlatformHistoryDdl { // DB2 requires an EXACT copy (same column types with null/non-null, same order) addSysPeriodColumns(writer, tableName); - writer.applyPostAlter().append("create table ").append(historyTableName) - .append(" as (select * from ").append(tableName).append(") with no data").endOfStatement(); + DdlBuffer tableBuf = writer.applyPostAlter(); + tableBuf.append("create table ").append(historyTableName) + .append(" as (select * from ").append(tableName).append(") with no data"); + if (table.getTablespaceMeta() != null) { + String tableSpace = platformDdl.extract(table.getTablespaceMeta().getTablespaceName()); + if (tableSpace != null && !tableSpace.isEmpty()) { + platformDdl.addTablespace(tableBuf, + tableSpace, + platformDdl.extract(table.getTablespaceMeta().getIndexTablespace()), + platformDdl.extract(table.getTablespaceMeta().getLobTablespace())); + } + } + tableBuf.endOfStatement(); enableSystemVersioning(writer.applyPostAlter(), tableName); platformDdl.alterTable(writer, tableName).setHistoryHandled(); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java index f46dd6977..1fbe97c15 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DbTriggerBasedHistoryDdl.java @@ -163,6 +163,8 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { protected void createHistoryTable(DdlBuffer apply, MTable table) { createHistoryTableAs(apply, table); createHistoryTableWithPeriod(apply); + // TODO: add tablespace here (currently no DbTriggerBased platforms with tablespace support) + apply.endOfStatement(); } protected void createHistoryTableAs(DdlBuffer apply, MTable table) { @@ -183,7 +185,7 @@ public abstract class DbTriggerBasedHistoryDdl implements PlatformHistoryDdl { writeColumnDefinition(apply, sysPeriodStart, sysPeriodType); apply.append(",").newLine(); writeColumnDefinition(apply, sysPeriodEnd, sysPeriodType); - apply.newLine().append(")").endOfStatement(); + apply.newLine().append(")"); } /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java index ceb531530..5a292716e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DdlHelp.java @@ -1,6 +1,8 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; public class DdlHelp { + public static final String TABLESPACE_DEFAULT = "$TABLESPACE_DEFAULT"; + public static final String DROP_DEFAULT = "DROP DEFAULT"; public static final String DROP_COMMENT = "DROP COMMENT"; @@ -36,4 +38,15 @@ public class DdlHelp { public static boolean isDropForeignKey(String value) { return DROP_FOREIGN_KEY.equals(value); } + + /** + * Returns the tablespace. Returns null, if this is the special '$TABLESPACE_DEFAULT' value. + */ + public static String toTablespace(String tablespace) { + if (TABLESPACE_DEFAULT.equals(tablespace)) { + return null; + } else { + return tablespace; + } + } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java index 7807d9252..5ade5a09a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -317,10 +317,13 @@ public class PlatformDdl { // if columnType is different for different platforms, use pattern // @Column(columnDefinition = PLATFORM1;DEFINITION1;PLATFORM2;DEFINITON2;DEFINITON-DEFAULT) // e.g. @Column(columnDefinition = "db2;blob(64M);sqlserver,h2;varchar(227);varchar(127)") - private String extract(String type) { - String[] tmp = type.split(";"); + protected String extract(String type) { + if (type == null) { + return null; + } + String[] tmp = type.split(";", -1); // do not discard trailing empty strings if (tmp.length % 2 == 0) { - throw new IllegalArgumentException("You need an odd number of arguments. See Issue #2559 for details"); + throw new IllegalArgumentException("You need an odd number of arguments in '" + type + "'. See Issue #2559 for details"); } for (int i = 0; i < tmp.length - 2; i += 2) { String[] platforms = tmp[i].split(","); @@ -783,6 +786,23 @@ public class PlatformDdl { public void addTablePartition(DdlBuffer apply, String partitionMode, String partitionColumn) { // only supported by postgres initially } + + /** + * Adds tablespace declaration. Now only supported for db2. + */ + public void addTablespace(DdlBuffer apply, String tablespaceName, String indexTablespace, String lobTablespace) { + throw new UnsupportedOperationException("Tablespaces are not supported for this platform"); + } + + /** + * Moves the table to an other tablespace. + */ + public String alterTableTablespace(String tablename, String tableSpace, String indexSpace, String lobSpace) { + if (tableSpace != null || indexSpace != null || lobSpace != null) { + throw new UnsupportedOperationException("Tablespaces are not supported for this platform"); + } + return null; + } protected String quote(String dbName) { return platform.convertQuotedIdentifiers(dbName); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java new file mode 100644 index 000000000..9e697196c --- /dev/null +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java @@ -0,0 +1,526 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2022.02.01 at 12:03:38 PM CET +// + + +package io.ebeaninternal.dbmigration.migration; + +import java.math.BigInteger; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <attGroup ref="{http://ebean-orm.github.io/xml/ns/dbmigration}tablespaceAttributes"/>
+ *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="newName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="partitionMode" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="partitionColumn" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="identityType" type="{http://ebean-orm.github.io/xml/ns/dbmigration}identityType" />
+ *       <attribute name="identityStart" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="identityIncrement" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="identityCache" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="identityGenerated" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="sequenceName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="sequenceInitial" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="sequenceAllocate" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" />
+ *       <attribute name="pkName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       <attribute name="storageEngine" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "alterTable") +public class AlterTable { + + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "newName") + protected String newName; + @XmlAttribute(name = "partitionMode") + protected String partitionMode; + @XmlAttribute(name = "partitionColumn") + protected String partitionColumn; + @XmlAttribute(name = "identityType") + protected IdentityType identityType; + @XmlAttribute(name = "identityStart") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger identityStart; + @XmlAttribute(name = "identityIncrement") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger identityIncrement; + @XmlAttribute(name = "identityCache") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger identityCache; + @XmlAttribute(name = "identityGenerated") + protected String identityGenerated; + @XmlAttribute(name = "sequenceName") + protected String sequenceName; + @XmlAttribute(name = "sequenceInitial") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger sequenceInitial; + @XmlAttribute(name = "sequenceAllocate") + @XmlSchemaType(name = "positiveInteger") + protected BigInteger sequenceAllocate; + @XmlAttribute(name = "pkName") + protected String pkName; + @XmlAttribute(name = "storageEngine") + protected String storageEngine; + @XmlAttribute(name = "tablespace") + protected String tablespace; + @XmlAttribute(name = "indexTablespace") + protected String indexTablespace; + @XmlAttribute(name = "lobTablespace") + protected String lobTablespace; + @XmlAttribute(name = "comment") + protected String comment; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the newName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getNewName() { + return newName; + } + + /** + * Sets the value of the newName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setNewName(String value) { + this.newName = value; + } + + /** + * Gets the value of the partitionMode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPartitionMode() { + return partitionMode; + } + + /** + * Sets the value of the partitionMode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPartitionMode(String value) { + this.partitionMode = value; + } + + /** + * Gets the value of the partitionColumn property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPartitionColumn() { + return partitionColumn; + } + + /** + * Sets the value of the partitionColumn property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPartitionColumn(String value) { + this.partitionColumn = value; + } + + /** + * Gets the value of the identityType property. + * + * @return + * possible object is + * {@link IdentityType } + * + */ + public IdentityType getIdentityType() { + return identityType; + } + + /** + * Sets the value of the identityType property. + * + * @param value + * allowed object is + * {@link IdentityType } + * + */ + public void setIdentityType(IdentityType value) { + this.identityType = value; + } + + /** + * Gets the value of the identityStart property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIdentityStart() { + return identityStart; + } + + /** + * Sets the value of the identityStart property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIdentityStart(BigInteger value) { + this.identityStart = value; + } + + /** + * Gets the value of the identityIncrement property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIdentityIncrement() { + return identityIncrement; + } + + /** + * Sets the value of the identityIncrement property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIdentityIncrement(BigInteger value) { + this.identityIncrement = value; + } + + /** + * Gets the value of the identityCache property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getIdentityCache() { + return identityCache; + } + + /** + * Sets the value of the identityCache property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setIdentityCache(BigInteger value) { + this.identityCache = value; + } + + /** + * Gets the value of the identityGenerated property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIdentityGenerated() { + return identityGenerated; + } + + /** + * Sets the value of the identityGenerated property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIdentityGenerated(String value) { + this.identityGenerated = value; + } + + /** + * Gets the value of the sequenceName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSequenceName() { + return sequenceName; + } + + /** + * Sets the value of the sequenceName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSequenceName(String value) { + this.sequenceName = value; + } + + /** + * Gets the value of the sequenceInitial property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getSequenceInitial() { + return sequenceInitial; + } + + /** + * Sets the value of the sequenceInitial property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setSequenceInitial(BigInteger value) { + this.sequenceInitial = value; + } + + /** + * Gets the value of the sequenceAllocate property. + * + * @return + * possible object is + * {@link BigInteger } + * + */ + public BigInteger getSequenceAllocate() { + return sequenceAllocate; + } + + /** + * Sets the value of the sequenceAllocate property. + * + * @param value + * allowed object is + * {@link BigInteger } + * + */ + public void setSequenceAllocate(BigInteger value) { + this.sequenceAllocate = value; + } + + /** + * Gets the value of the pkName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPkName() { + return pkName; + } + + /** + * Sets the value of the pkName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPkName(String value) { + this.pkName = value; + } + + /** + * Gets the value of the storageEngine property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStorageEngine() { + return storageEngine; + } + + /** + * Sets the value of the storageEngine property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStorageEngine(String value) { + this.storageEngine = value; + } + + /** + * Gets the value of the tablespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTablespace() { + return tablespace; + } + + /** + * Sets the value of the tablespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTablespace(String value) { + this.tablespace = value; + } + + /** + * Gets the value of the indexTablespace property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getIndexTablespace() { + return indexTablespace; + } + + /** + * Sets the value of the indexTablespace property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setIndexTablespace(String value) { + this.indexTablespace = value; + } + + /** + * Gets the value of the lobTablespace property. + * + * @return possible object is + * {@link String } + */ + public String getLobTablespace() { + return lobTablespace; + } + + /** + * Sets the value of the lobTablespace property. + * + * @param value allowed object is + * {@link String } + */ + public void setLobTablespace(String value) { + this.lobTablespace = value; + } + + /** + * Gets the value of the comment property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getComment() { + return comment; + } + + /** + * Sets the value of the comment property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setComment(String value) { + this.comment = value; + } + +} diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java index 5fa984ce1..68d971f37 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java @@ -47,6 +47,7 @@ public class ChangeSet { @XmlElement(name = "configuration", type = Configuration.class), @XmlElement(name = "sql", type = Sql.class), @XmlElement(name = "createTable", type = CreateTable.class), + @XmlElement(name = "alterTable", type = AlterTable.class), @XmlElement(name = "dropTable", type = DropTable.class), @XmlElement(name = "renameTable", type = RenameTable.class), @XmlElement(name = "addTableComment", type = AddTableComment.class), diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java index 8c451d2ec..da87ee195 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java @@ -99,6 +99,8 @@ public class CreateTable { protected String tablespace; @XmlAttribute(name = "indexTablespace") protected String indexTablespace; + @XmlAttribute(name = "lobTablespace") + protected String lobTablespace; @XmlAttribute(name = "comment") protected String comment; @@ -522,6 +524,26 @@ public class CreateTable { public void setIndexTablespace(String value) { this.indexTablespace = value; } + + /** + * Gets the value of the lobTablespace property. + * + * @return possible object is + * {@link String } + */ + public String getLobTablespace() { + return lobTablespace; + } + + /** + * Sets the value of the lobTablespace property. + * + * @param value allowed object is + * {@link String } + */ + public void setLobTablespace(String value) { + this.lobTablespace = value; + } /** * Gets the value of the comment property. diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java index ac15ca0d5..38e530287 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java @@ -187,6 +187,13 @@ public class ObjectFactory { return new ChangeSet(); } + /** + * Create an instance of {@link AlterTable } + */ + public AlterTable createAlterTable() { + return new AlterTable(); + } + /** * Create an instance of {@link AddHistoryTable } */ diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java index 5a6770732..96cd1b494 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTable.java @@ -5,6 +5,7 @@ import io.ebeaninternal.dbmigration.migration.AddColumn; import io.ebeaninternal.dbmigration.migration.AddHistoryTable; import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AlterColumn; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.Column; import io.ebeaninternal.dbmigration.migration.CreateTable; import io.ebeaninternal.dbmigration.migration.DropColumn; @@ -17,6 +18,8 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.deploy.IdentityMode; import io.ebeaninternal.server.deploy.PartitionMeta; +import io.ebeaninternal.server.deploy.TablespaceMeta; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,6 +29,7 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import static io.ebeaninternal.dbmigration.ddlgeneration.platform.SplitColumns.split; @@ -56,11 +60,10 @@ public class MTable { */ private boolean draft; private PartitionMeta partitionMeta; + private TablespaceMeta tablespaceMeta; private String pkName; private String comment; - private String tablespace; private String storageEngine; - private String indexTablespace; private IdentityMode identityMode; private boolean withHistory; private final Map columns = new LinkedHashMap<>(); @@ -93,6 +96,7 @@ public class MTable { this.identityMode = descriptor.identityMode(); this.storageEngine = descriptor.storageEngine(); this.partitionMeta = descriptor.partitionMeta(); + this.tablespaceMeta = descriptor.tablespaceMeta(); this.comment = descriptor.dbComment(); if (descriptor.isHistorySupport()) { withHistory = true; @@ -104,11 +108,28 @@ public class MTable { } /** - * Construct for element collection or intersection table. + * Constructor for test cases only! */ + @Deprecated public MTable(String name) { + this(name, null, null); + } + + /** + * Construct for element collection or intersection table. They have same table space and storage engine. + */ + public MTable(String name, BeanDescriptor descriptor) { + this(name, descriptor.tablespaceMeta(), descriptor.storageEngine()); + } + + /** + * Constructor for dependant tables (draft/element collection or intersection). + */ + private MTable(String name, TablespaceMeta tablespaceMeta, String storageEngine) { this.name = name; this.identityMode = IdentityMode.NONE; + this.tablespaceMeta = tablespaceMeta; + this.storageEngine = storageEngine; } /** @@ -118,7 +139,7 @@ public class MTable { * later when creating the CreateTable object. */ public MTable createDraftTable() { - draftTable = new MTable(name + "_draft"); + draftTable = new MTable(name + "_draft", this.tablespaceMeta, this.storageEngine); draftTable.draft = true; draftTable.whenCreatedColumn = whenCreatedColumn; // compoundKeys @@ -138,8 +159,13 @@ public class MTable { this.pkName = createTable.getPkName(); this.comment = createTable.getComment(); this.storageEngine = createTable.getStorageEngine(); - this.tablespace = createTable.getTablespace(); - this.indexTablespace = createTable.getIndexTablespace(); + if (createTable.getTablespace() != null) { + this.tablespaceMeta = new TablespaceMeta(createTable.getTablespace(), + createTable.getIndexTablespace() != null ? createTable.getIndexTablespace() : createTable.getTablespace(), + createTable.getLobTablespace() != null ? createTable.getLobTablespace() : createTable.getTablespace()); + } else { + this.tablespaceMeta = null; + } this.withHistory = Boolean.TRUE.equals(createTable.isWithHistory()); this.draft = Boolean.TRUE.equals(createTable.isDraft()); this.identityMode = fromCreateTable(createTable); @@ -210,8 +236,11 @@ public class MTable { createTable.setPartitionColumn(partitionMeta.getProperty()); } createTable.setStorageEngine(storageEngine); - createTable.setTablespace(tablespace); - createTable.setIndexTablespace(indexTablespace); + if (tablespaceMeta != null) { + createTable.setTablespace(tablespaceMeta.getTablespaceName()); + createTable.setIndexTablespace(tablespaceMeta.getIndexTablespace()); + createTable.setLobTablespace(tablespaceMeta.getLobTablespace()); + } toCreateTable(identityMode, createTable); if (withHistory) { createTable.setWithHistory(Boolean.TRUE); @@ -266,6 +295,8 @@ public class MTable { compareCompoundKeys(modelDiff, newTable); compareUniqueKeys(modelDiff, newTable); + compareTableAttrs(modelDiff, newTable); + } private void compareColumns(ModelDiff modelDiff, MTable newTable) { @@ -335,6 +366,29 @@ public class MTable { modelDiff.addUniqueConstraint(newKey.addUniqueConstraint(name)); } } + + private void compareTableAttrs(ModelDiff modelDiff, MTable newTable) { + AlterTable alterTable = new AlterTable(); + alterTable.setName(newTable.getName()); + boolean altered = false; + + if (!Objects.equals(tablespaceMeta, newTable.getTablespaceMeta())) { + if (newTable.getTablespaceMeta() == null) { + alterTable.setTablespace(DdlHelp.TABLESPACE_DEFAULT); + alterTable.setIndexTablespace(DdlHelp.TABLESPACE_DEFAULT); + alterTable.setLobTablespace(DdlHelp.TABLESPACE_DEFAULT); + } else { + alterTable.setTablespace(newTable.getTablespaceMeta().getTablespaceName()); + alterTable.setIndexTablespace(newTable.getTablespaceMeta().getIndexTablespace()); + alterTable.setLobTablespace(newTable.getTablespaceMeta().getLobTablespace()); + } + altered = true; + } + + if (altered) { + modelDiff.addAlterTable(alterTable); + } + } /** * Apply AddColumn migration. @@ -424,13 +478,13 @@ public class MTable { public void setComment(String comment) { this.comment = comment; } - - public String getTablespace() { - return tablespace; + + public void setTablespaceMeta(TablespaceMeta tablespaceMeta) { + this.tablespaceMeta = tablespaceMeta; } - - public String getIndexTablespace() { - return indexTablespace; + + public TablespaceMeta getTablespaceMeta() { + return tablespaceMeta; } public boolean isWithHistory() { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java index 0da3600c7..c9ef40e2d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelContainer.java @@ -8,6 +8,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.ChangeSetType; import io.ebeaninternal.dbmigration.migration.CreateIndex; @@ -19,6 +20,7 @@ import io.ebeaninternal.dbmigration.migration.DropTable; import io.ebeaninternal.dbmigration.migration.Migration; import io.ebeaninternal.dbmigration.migration.RenameColumn; import io.ebeaninternal.dbmigration.migration.Sql; +import io.ebeaninternal.server.deploy.TablespaceMeta; import java.util.ArrayList; import java.util.Collection; @@ -155,6 +157,8 @@ public class ModelContainer { applyChange((CreateTable) change); } else if (change instanceof DropTable) { applyChange((DropTable) change); + } else if (change instanceof AlterTable) { + applyChange((AlterTable) change); } else if (change instanceof AlterColumn) { applyChange((AlterColumn) change); } else if (change instanceof AddColumn) { @@ -261,6 +265,34 @@ public class ModelContainer { protected void applyChange(DropTable dropTable) { tables.remove(dropTable.getName()); } + + /** + * Apply a AlterTable change to the model. + */ + protected void applyChange(AlterTable alterTable) { + MTable table = getTable(alterTable.getName()); + if (table == null) { + throw new IllegalStateException("Table [" + alterTable.getName() + "] does not exist in model?"); + } + // Handle Tablespace change + TablespaceMeta ts = table.getTablespaceMeta(); + + if (alterTable.getTablespace() != null) { + String currentTableSpace = DdlHelp.toTablespace(alterTable.getTablespace()); + String currentIndexSpace = DdlHelp.toTablespace(alterTable.getIndexTablespace()); + String currentLobSpace = DdlHelp.toTablespace(alterTable.getLobTablespace()); + + if (currentTableSpace != null) { + assert currentIndexSpace != null; + assert currentLobSpace != null; + table.setTablespaceMeta(new TablespaceMeta(currentTableSpace, currentIndexSpace, currentLobSpace)); + } else { + assert currentIndexSpace == null; + assert currentLobSpace == null; + table.setTablespaceMeta(null); + } + } + } /** * Apply a CreateTable change to the model. diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java index 367c13ca5..9bf5cf0d0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/ModelDiff.java @@ -6,6 +6,7 @@ import io.ebeaninternal.dbmigration.migration.AddTableComment; import io.ebeaninternal.dbmigration.migration.AddUniqueConstraint; import io.ebeaninternal.dbmigration.migration.AlterColumn; import io.ebeaninternal.dbmigration.migration.AlterForeignKey; +import io.ebeaninternal.dbmigration.migration.AlterTable; import io.ebeaninternal.dbmigration.migration.ChangeSet; import io.ebeaninternal.dbmigration.migration.ChangeSetType; import io.ebeaninternal.dbmigration.migration.CreateIndex; @@ -252,4 +253,11 @@ public class ModelDiff { public void addAlterForeignKey(AlterForeignKey alterForeignKey) { applyChanges.add(alterForeignKey); } + + /** + * Adds a table alter. + */ + public void addAlterTable(AlterTable alterTable) { + applyChanges.add(alterTable); + } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java index a8a4d944e..210ac57bc 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildElementTable.java @@ -18,7 +18,7 @@ public class ModelBuildElementTable { BeanTable beanTable = manyProp.beanTable(); BeanDescriptor targetDescriptor = manyProp.targetDescriptor(); - MTable table = new MTable(beanTable.getBaseTable()); + MTable table = new MTable(beanTable.getBaseTable(), manyProp.descriptor()); VisitProperties.visit(targetDescriptor, new ModelBuildPropertyVisitor(ctx, table, targetDescriptor)); ctx.addTableElementCollection(table); diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java index 179de2ef8..763016278 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/build/ModelBuildIntersectionTable.java @@ -62,7 +62,7 @@ class ModelBuildIntersectionTable { BeanDescriptor targetDesc = manyProp.targetDescriptor(); String tableName = intersectionTableJoin.getTable(); - MTable table = new MTable(tableName); + MTable table = new MTable(tableName, localDesc); if (!manyProp.isExcludedFromHistory()) { if (localDesc.isHistorySupport()) { table.setWithHistory(true); diff --git a/ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd b/ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd index 27fc52cfa..e7ef14be7 100644 --- a/ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd +++ b/ebean-ddl-generator/src/main/resources/ebean-dbmigration-1.0.xsd @@ -218,6 +218,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -341,6 +362,7 @@ + @@ -351,6 +373,7 @@ + diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java index 092bc75fa..afd56d72c 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java @@ -4,6 +4,7 @@ import io.localtest.BaseTestCase; import io.ebean.DB; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.db2.DB2LuwPlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; @@ -42,6 +43,9 @@ public class BaseDdlHandlerTest extends BaseTestCase { return handler(new HanaPlatform()); } + private DdlHandler db2Handler() { + return handler(new DB2LuwPlatform()); + } @Test public void addColumn_nullable_noConstraint() throws Exception { @@ -219,6 +223,19 @@ public class BaseDdlHandlerTest extends BaseTestCase { assertThat(writer.dropAll().getBuffer().trim()).isEqualTo("drop table foo cascade;"); } + @Test + public void createTableWithTableSpace() throws Exception { + + DdlWrite writer = new DdlWrite(); + DdlHandler handler = db2Handler(); + + handler.generate(writer, Helper.getCreateTable()); + + assertThat(writer.toString()) + .contains("create table foo (") + .contains(") in fooSpace index in fooIndexSpace long in fooLobSpace;"); + } + @Test public void generateChangeSet() throws Exception { diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java index e7b8fab30..73156d0a7 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_CreateIndexTest.java @@ -2,6 +2,7 @@ package io.ebeaninternal.dbmigration.ddlgeneration.platform; import io.ebean.DB; import io.ebean.config.DatabaseConfig; +import io.ebean.config.dbplatform.db2.DB2LuwPlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.hana.HanaPlatform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; @@ -23,6 +24,7 @@ public class PlatformDdl_CreateIndexTest { private final PlatformDdl oraDdl = PlatformDdlBuilder.create(new OraclePlatform()); private final PlatformDdl sqlServerDdl = PlatformDdlBuilder.create(new SqlServer17Platform()); private final PlatformDdl hanaDdl = PlatformDdlBuilder.create(new HanaPlatform()); + private final PlatformDdl db2LuwDdl = PlatformDdlBuilder.create(new DB2LuwPlatform()); { DatabaseConfig config = DB.getDefault().pluginApi().config(); @@ -32,6 +34,7 @@ public class PlatformDdl_CreateIndexTest { oraDdl.configure(config); sqlServerDdl.configure(config); hanaDdl.configure(config); + db2LuwDdl.configure(config); } WriteCreateIndex writeCreateIndex() { @@ -71,6 +74,8 @@ public class PlatformDdl_CreateIndexTest { assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql); sql = hanaDdl.createIndex(createIndex); assertThat(sql).isEqualTo("-- explicit index \"ix_mytab_acol\" for single column \"acol\" of table \"mytab\" is not necessary"); + sql = db2LuwDdl.createIndex(createIndex); + assertThat(sql).isEqualTo("create unique index ix_mytab_acol on mytab (acol)"); } @Test @@ -95,4 +100,21 @@ public class PlatformDdl_CreateIndexTest { assertEquals("create index ix_mytab_acol on mytab (acol)", sql); } + @Test + public void db2luw_fkeyCreateIndex() { + String sql = db2LuwDdl.createIndex(fkeyCreateIndex(true)); + assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql); + + sql = db2LuwDdl.createIndex(fkeyCreateIndex(false)); + assertEquals("create index ix_mytab_acol on mytab (acol)", sql); + } + + @Test + public void db2luw_tablespaceIndex() { + String sql = db2LuwDdl.createIndex(new WriteCreateIndex("ix_mytab_acol", "mytab", new String[]{"acol"}, false)); + assertEquals("create index ix_mytab_acol on mytab (acol)", sql); + sql = db2LuwDdl.createIndex(new WriteCreateIndex("ix_mytab_acol", "mytab", new String[]{"acol"}, true)); + assertEquals("create unique index ix_mytab_acol on mytab (acol)", sql); + } + } diff --git a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java index da493f9ef..18fdefb3e 100644 --- a/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java +++ b/ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java @@ -34,8 +34,9 @@ public class ModelContainerApplyTest { MTable foo = model.getTable("foo"); assertThat(foo.getComment()).isEqualTo("comment"); - assertThat(foo.getTablespace()).isEqualTo("fooSpace"); - assertThat(foo.getIndexTablespace()).isEqualTo("fooIndexSpace"); + assertThat(foo.getTablespaceMeta().getTablespaceName()).isEqualTo("db2;fooSpace;"); + assertThat(foo.getTablespaceMeta().getIndexTablespace()).isEqualTo("db2;fooIndexSpace;"); + assertThat(foo.getTablespaceMeta().getLobTablespace()).isEqualTo("db2;fooLobSpace;"); assertThat(foo.isWithHistory()).isEqualTo(false); assertThat(foo.allColumns()).extracting("name").contains("col1", "col3", "added_to_foo"); } diff --git a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java index 06390a20e..22b03d983 100644 --- a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java +++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java @@ -47,6 +47,10 @@ public abstract class BaseTestCase { public boolean isSqlServer() { return Platform.SQLSERVER == platform(); } + + public boolean isDB2() { + return Platform.DB2 == platform(); + } public boolean isH2() { return Platform.H2 == platform(); diff --git a/ebean-ddl-generator/src/test/resources/container/test-create-table.xml b/ebean-ddl-generator/src/test/resources/container/test-create-table.xml index 9c5bc2e30..303aa9c01 100644 --- a/ebean-ddl-generator/src/test/resources/container/test-create-table.xml +++ b/ebean-ddl-generator/src/test/resources/container/test-create-table.xml @@ -4,7 +4,7 @@ - + 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 a7461173e..9174772fe 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -95,6 +95,10 @@ public class DbMigrationTest extends BaseTestCase { if (isSqlServer() || isMariaDB() || isMySql() || isHana()) { runScript("I__create_procs.sql"); } + + if(isDb2()) { + runScript("I__create_tablespaces.sql"); + } runScript("1.0__initial.sql"); diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index c6a451a9f..e8d8f0763 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -5,6 +5,7 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; +import io.ebean.annotation.Tablespace; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,10 @@ import java.util.List; @Entity @Table(name = "migtest_e_basic") +// Note: tablespaces are currently only supported for DB2 +// to be prepared for future (when we support sql server filegroups), +// we allow to specify the DB-platform here +@Tablespace(value = "db2;TSTABLES;", index = "db2;INDEXTS;") public class EBasic { public enum Status { diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index fe0bcdfe9..ec2381650 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -5,8 +5,11 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import io.ebean.annotation.Tablespace; + @Entity @Table(name = "migtest_e_history") +@Tablespace("db2;MAIN;") public class EHistory { @Id diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 6837fc3f9..3ed011c12 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -56,7 +56,7 @@ public class EBasic { "update ${table} set status = 'N' where id = 1" }, platforms = Platform.DB2) @DbMigration(preAlter = "-- rename all collisions") @Column(unique = true) - @Size(max=127) + @Size(max = 127) String description; @DbJson diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index f67b4c9f2..a8773205d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -5,6 +5,7 @@ import io.ebean.annotation.DbComment; import io.ebean.annotation.DbMigration; import io.ebean.annotation.History; import io.ebean.annotation.Platform; +import io.ebean.annotation.Tablespace; import javax.persistence.Entity; import javax.persistence.Id; @@ -14,6 +15,8 @@ import javax.persistence.Table; @Table(name = "migtest_e_history") @History @DbComment("We have history now") +// TODO: Should we allow own table space for history? +@Tablespace("db2;MAIN;") public class EHistory { @Id diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index bdcd43845..3ba02c2a5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -4,10 +4,14 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; + +import io.ebean.annotation.Tablespace; + import java.util.List; @Entity @Table(name = "migtest_mtm_c") +@Tablespace("db2;TESTTS;") public class MtmChild { @Id diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index de0f3ffc9..3c132c2c9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -5,10 +5,14 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; + +import io.ebean.annotation.Tablespace; + import java.util.List; @Entity @Table(name = "migtest_mtm_m") +@Tablespace("db2;TSMASTER;") public class MtmMaster { @Id diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index 0e166625c..ab2fbdf33 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -5,8 +5,11 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import io.ebean.annotation.Tablespace; + @Entity @Table(name = "migtest_e_history") +@Tablespace("db2;MAIN;") public class EHistory { @Id diff --git a/ebean-test/src/test/resources/extra-ddl.xml b/ebean-test/src/test/resources/extra-ddl.xml index ba824c38a..130de7fac 100644 --- a/ebean-test/src/test/resources/extra-ddl.xml +++ b/ebean-test/src/test/resources/extra-ddl.xml @@ -64,4 +64,41 @@ create index ix_ebasic_jmjb_gin2 on ebasic_json_map_json_b using gin(content jsonb_path_ops); + +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TSTABLES')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TSTABLES"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'INDEXTS')) +THEN EXECUTE IMMEDIATE 'CREATE TABLESPACE "INDEXTS"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TESTTS')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TESTTS"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TSMASTER')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TSMASTER"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'MAIN')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "MAIN"'; +END IF; +END +$$ + From 250e66819bb38c4aabfd213cf88cdf2af0f2408f Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 22 Mar 2022 17:05:04 +0100 Subject: [PATCH 05/17] Reference scripts --- .../dbmigration/db2fori/1.0__initial.sql | 4 +-- .../migrationtest/dbmigration/db2fori/1.1.sql | 11 +++--- .../migrationtest/dbmigration/db2fori/1.3.sql | 2 ++ .../dbmigration/db2fori/idx_db2.migrations | 6 ++-- .../dbmigration/db2legacy/1.0__initial.sql | 4 +-- .../dbmigration/db2legacy/1.1.sql | 11 +++--- .../dbmigration/db2legacy/1.3.sql | 2 ++ .../dbmigration/db2legacy/idx_db2.migrations | 6 ++-- .../dbmigration/db2luw/1.0__initial.sql | 4 +-- .../migrationtest/dbmigration/db2luw/1.1.sql | 11 +++--- .../migrationtest/dbmigration/db2luw/1.3.sql | 2 ++ .../db2luw/I__create_tablespaces.sql | 36 +++++++++++++++++++ .../dbmigration/db2luw/idx_db2.migrations | 7 ++-- .../dbmigration/db2zos/1.0__initial.sql | 4 +-- .../migrationtest/dbmigration/db2zos/1.1.sql | 11 +++--- .../migrationtest/dbmigration/db2zos/1.3.sql | 2 ++ .../dbmigration/db2zos/idx_db2.migrations | 6 ++-- .../dbmigration/model/1.0__initial.model.xml | 4 +-- .../dbmigration/model/1.1.model.xml | 9 +++-- .../dbmigration/model/1.3.model.xml | 2 ++ ebean-test/testconfig/ebean-db2.properties | 4 ++- 21 files changed, 106 insertions(+), 42 deletions(-) create mode 100644 ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql index a64383897..20ebe89e7 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.0__initial.sql @@ -77,7 +77,7 @@ create table migtest_e_basic ( constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) -); +) in TSTABLES index in INDEXTS long in TSTABLES; create table migtest_e_enum ( id integer generated by default as identity not null, @@ -90,7 +90,7 @@ create table migtest_e_history ( id integer generated by default as identity not null, test_string varchar(255), constraint pk_migtest_e_history primary key (id) -); +) in MAIN index in MAIN long in MAIN; create table migtest_e_history2 ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql index 1cc7b4b1d..9ed658aca 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.1.sql @@ -87,18 +87,18 @@ create table migtest_mtm_c_migtest_mtm_m ( migtest_mtm_c_id integer not null, migtest_mtm_m_id bigint not null, constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id) -); +) in TESTTS index in TESTTS long in TESTTS; create table migtest_mtm_m_migtest_mtm_c ( migtest_mtm_m_id bigint not null, migtest_mtm_c_id integer not null, constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id) -); +) in TSMASTER index in TSMASTER long in TSMASTER; create table migtest_mtm_m_phone_numbers ( migtest_mtm_m_id bigint not null, value varchar(255) not null -); +) in TSMASTER index in TSMASTER long in TSMASTER; update migtest_e_basic set status = 'A' where status is null; @@ -107,6 +107,7 @@ update migtest_e_basic set status = 'A' where status is null; update migtest_e_basic set status = 'N' where id = 1; insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_E_BASIC','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; @@ -119,6 +120,8 @@ alter table migtest_e_history5 drop versioning; update migtest_e_history6 set test_number1 = 42 where test_number1 is null; alter table migtest_e_history6 drop versioning; alter table "table" drop versioning; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE'); -- apply alter tables alter table "table" add column "select" varchar(255); alter table migtest_ckey_detail add column one_key integer; @@ -182,7 +185,7 @@ create unique index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(stat create unique index uq_migtest_e_basic_name on migtest_e_basic(name) exclude null keys; create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) exclude null keys; create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys; -create table migtest_e_history_history as (select * from migtest_e_history) with no data; +create table migtest_e_history_history as (select * from migtest_e_history) with no data in MAIN index in MAIN long in MAIN; alter table migtest_e_history add versioning use history table migtest_e_history_history; 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'; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql index 2fcd77858..545ccdeb4 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/1.3.sql @@ -167,6 +167,8 @@ alter table migtest_e_history6 drop versioning; -- NOTE: table has @History - special migration may be necessary update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- apply alter tables alter table migtest_e_basic alter column status drop default; alter table migtest_e_basic alter column status drop not null; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations index 69a27f3a5..efd9f0faa 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations @@ -1,7 +1,7 @@ --1073246286, 1.0__initial.sql -2043476851, 1.1.sql +-2035307143, 1.0__initial.sql +2129080414, 1.1.sql 364066694, 1.2__dropsFor_1.1.sql -1155358918, 1.3.sql +1302478095, 1.3.sql -1199420632, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql index 578d7cdff..fc3c2054e 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.0__initial.sql @@ -77,7 +77,7 @@ create table migtest_e_basic ( constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')), constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) -); +) in TSTABLES index in INDEXTS long in TSTABLES; create table migtest_e_enum ( id integer generated by default as identity not null, @@ -90,7 +90,7 @@ create table migtest_e_history ( id integer generated by default as identity not null, test_string varchar(255), constraint pk_migtest_e_history primary key (id) -); +) in MAIN index in MAIN long in MAIN; create table migtest_e_history2 ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql index 21013eea0..82051c0b1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.1.sql @@ -87,18 +87,18 @@ create table migtest_mtm_c_migtest_mtm_m ( migtest_mtm_c_id integer not null, migtest_mtm_m_id bigint not null, constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id) -); +) in TESTTS index in TESTTS long in TESTTS; create table migtest_mtm_m_migtest_mtm_c ( migtest_mtm_m_id bigint not null, migtest_mtm_c_id integer not null, constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id) -); +) in TSMASTER index in TSMASTER long in TSMASTER; create table migtest_mtm_m_phone_numbers ( migtest_mtm_m_id bigint not null, value varchar(255) not null -); +) in TSMASTER index in TSMASTER long in TSMASTER; update migtest_e_basic set status = 'A' where status is null; @@ -107,6 +107,7 @@ update migtest_e_basic set status = 'A' where status is null; update migtest_e_basic set status = 'N' where id = 1; insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_E_BASIC','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; @@ -119,6 +120,8 @@ alter table migtest_e_history5 drop versioning; update migtest_e_history6 set test_number1 = 42 where test_number1 is null; alter table migtest_e_history6 drop versioning; alter table "table" drop versioning; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE'); -- apply alter tables alter table "table" add column "select" varchar(255); alter table migtest_ckey_detail add column one_key integer; @@ -182,7 +185,7 @@ create unique index uq_mgtst__b_ucfcne on migtest_e_basic(status,indextest1) exc create unique index uq_mgtst__bsc_nm on migtest_e_basic(name) exclude null keys; create unique index uq_mgtst__b_4ayc00 on migtest_e_basic(indextest4) exclude null keys; create unique index uq_mgtst__b_4ayc01 on migtest_e_basic(indextest5) exclude null keys; -create table migtest_e_history_history as (select * from migtest_e_history) with no data; +create table migtest_e_history_history as (select * from migtest_e_history) with no data in MAIN index in MAIN long in MAIN; alter table migtest_e_history add versioning use history table migtest_e_history_history; 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'; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql index 358d219a8..cdd739792 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/1.3.sql @@ -167,6 +167,8 @@ alter table migtest_e_history6 drop versioning; -- NOTE: table has @History - special migration may be necessary update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- apply alter tables alter table migtest_e_basic alter column status drop default; alter table migtest_e_basic alter column status drop not null; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations index 880eb4bf6..359f08af9 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations @@ -1,7 +1,7 @@ -2054922533, 1.0__initial.sql -1256892738, 1.1.sql +-867624537, 1.0__initial.sql +-1885896768, 1.1.sql 364066694, 1.2__dropsFor_1.1.sql -1760988648, 1.3.sql +-29831669, 1.3.sql -1199420632, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql index c2235d9c9..8a9d1adeb 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.0__initial.sql @@ -77,7 +77,7 @@ create table migtest_e_basic ( constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) -); +) in TSTABLES index in INDEXTS long in TSTABLES; create table migtest_e_enum ( id integer generated by default as identity not null, @@ -90,7 +90,7 @@ create table migtest_e_history ( id integer generated by default as identity not null, test_string varchar(255), constraint pk_migtest_e_history primary key (id) -); +) in MAIN index in MAIN long in MAIN; create table migtest_e_history2 ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql index 2fb812410..a5d6e0287 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.1.sql @@ -87,18 +87,18 @@ create table migtest_mtm_c_migtest_mtm_m ( migtest_mtm_c_id integer not null, migtest_mtm_m_id bigint not null, constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id) -); +) in TESTTS index in TESTTS long in TESTTS; create table migtest_mtm_m_migtest_mtm_c ( migtest_mtm_m_id bigint not null, migtest_mtm_c_id integer not null, constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id) -); +) in TSMASTER index in TSMASTER long in TSMASTER; create table migtest_mtm_m_phone_numbers ( migtest_mtm_m_id bigint not null, value varchar(255) not null -); +) in TSMASTER index in TSMASTER long in TSMASTER; update migtest_e_basic set status = 'A' where status is null; @@ -107,6 +107,7 @@ update migtest_e_basic set status = 'A' where status is null; update migtest_e_basic set status = 'N' where id = 1; insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_E_BASIC','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; @@ -119,6 +120,8 @@ alter table migtest_e_history5 drop versioning; update migtest_e_history6 set test_number1 = 42 where test_number1 is null; alter table migtest_e_history6 drop versioning; alter table "table" drop versioning; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE'); -- apply alter tables alter table "table" add column "select" varchar(255); alter table migtest_ckey_detail add column one_key integer; @@ -182,7 +185,7 @@ create unique index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(stat create unique index uq_migtest_e_basic_name on migtest_e_basic(name) exclude null keys; create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) exclude null keys; create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys; -create table migtest_e_history_history as (select * from migtest_e_history) with no data; +create table migtest_e_history_history as (select * from migtest_e_history) with no data in MAIN index in MAIN long in MAIN; alter table migtest_e_history add versioning use history table migtest_e_history_history; 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'; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql index 9dbb719d6..b5d82e860 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/1.3.sql @@ -167,6 +167,8 @@ alter table migtest_e_history6 drop versioning; -- NOTE: table has @History - special migration may be necessary update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- apply alter tables alter table migtest_e_basic alter column status drop default; alter table migtest_e_basic alter column status drop not null; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql new file mode 100644 index 000000000..84692a31d --- /dev/null +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql @@ -0,0 +1,36 @@ + +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TSTABLES')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TSTABLES"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'INDEXTS')) +THEN EXECUTE IMMEDIATE 'CREATE TABLESPACE "INDEXTS"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TESTTS')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TESTTS"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'TSMASTER')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "TSMASTER"'; +END IF; +END +$$ +delimiter $$ +BEGIN +IF (NOT exists (SELECT * FROM SYSIBM.SYSTABLESPACES WHERE TBSPACE = 'MAIN')) THEN +EXECUTE IMMEDIATE 'CREATE TABLESPACE "MAIN"'; +END IF; +END +$$ diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations index 9d4b61aa7..27ba5f2fc 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations @@ -1,7 +1,8 @@ --1519091511, 1.0__initial.sql --370964456, 1.1.sql +1307787475, I__create_tablespaces.sql +-1520031543, 1.0__initial.sql +1233890256, 1.1.sql 364066694, 1.2__dropsFor_1.1.sql -591329540, 1.3.sql +-1775325396, 1.3.sql -1199420632, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql index c2235d9c9..8a9d1adeb 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.0__initial.sql @@ -77,7 +77,7 @@ create table migtest_e_basic ( constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) -); +) in TSTABLES index in INDEXTS long in TSTABLES; create table migtest_e_enum ( id integer generated by default as identity not null, @@ -90,7 +90,7 @@ create table migtest_e_history ( id integer generated by default as identity not null, test_string varchar(255), constraint pk_migtest_e_history primary key (id) -); +) in MAIN index in MAIN long in MAIN; create table migtest_e_history2 ( id integer generated by default as identity not null, diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql index 2fb812410..a5d6e0287 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.1.sql @@ -87,18 +87,18 @@ create table migtest_mtm_c_migtest_mtm_m ( migtest_mtm_c_id integer not null, migtest_mtm_m_id bigint not null, constraint pk_migtest_mtm_c_migtest_mtm_m primary key (migtest_mtm_c_id,migtest_mtm_m_id) -); +) in TESTTS index in TESTTS long in TESTTS; create table migtest_mtm_m_migtest_mtm_c ( migtest_mtm_m_id bigint not null, migtest_mtm_c_id integer not null, constraint pk_migtest_mtm_m_migtest_mtm_c primary key (migtest_mtm_m_id,migtest_mtm_c_id) -); +) in TSMASTER index in TSMASTER long in TSMASTER; create table migtest_mtm_m_phone_numbers ( migtest_mtm_m_id bigint not null, value varchar(255) not null -); +) in TSMASTER index in TSMASTER long in TSMASTER; update migtest_e_basic set status = 'A' where status is null; @@ -107,6 +107,7 @@ update migtest_e_basic set status = 'A' where status is null; update migtest_e_basic set status = 'N' where id = 1; insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_E_BASIC','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- NOTE: table has @History - special migration may be necessary update migtest_e_history2 set test_string = 'unknown' where test_string is null; @@ -119,6 +120,8 @@ alter table migtest_e_history5 drop versioning; update migtest_e_history6 set test_number1 = 42 where test_number1 is null; alter table migtest_e_history6 drop versioning; alter table "table" drop versioning; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','TESTTS','TESTTS','TESTTS','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','TSMASTER','TSMASTER','TSMASTER','','','','','','MOVE'); -- apply alter tables alter table "table" add column "select" varchar(255); alter table migtest_ckey_detail add column one_key integer; @@ -182,7 +185,7 @@ create unique index uq_migtest_e_basic_status_indextest1 on migtest_e_basic(stat create unique index uq_migtest_e_basic_name on migtest_e_basic(name) exclude null keys; create unique index uq_migtest_e_basic_indextest4 on migtest_e_basic(indextest4) exclude null keys; create unique index uq_migtest_e_basic_indextest5 on migtest_e_basic(indextest5) exclude null keys; -create table migtest_e_history_history as (select * from migtest_e_history) with no data; +create table migtest_e_history_history as (select * from migtest_e_history) with no data in MAIN index in MAIN long in MAIN; alter table migtest_e_history add versioning use history table migtest_e_history_history; 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'; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql index 9dbb719d6..b5d82e860 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/1.3.sql @@ -167,6 +167,8 @@ alter table migtest_e_history6 drop versioning; -- NOTE: table has @History - special migration may be necessary update migtest_e_history6 set test_number2 = 7 where test_number2 is null; +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_C','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); +CALL SYSPROC.ADMIN_MOVE_TABLE(CURRENT_SCHEMA,'MIGTEST_MTM_M','USERSPACE1','USERSPACE1','USERSPACE1','','','','','','MOVE'); -- apply alter tables alter table migtest_e_basic alter column status drop default; alter table migtest_e_basic alter column status drop not null; diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations index 9d4b61aa7..cb4a3dfc1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations @@ -1,7 +1,7 @@ --1519091511, 1.0__initial.sql --370964456, 1.1.sql +-1520031543, 1.0__initial.sql +1233890256, 1.1.sql 364066694, 1.2__dropsFor_1.1.sql -591329540, 1.3.sql +-1775325396, 1.3.sql -1199420632, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml index 001f3797f..082c9bd3a 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml @@ -37,7 +37,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml index 410615793..2b7b577e3 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml @@ -47,6 +47,7 @@ + @@ -79,19 +80,21 @@ - + + - + + - + diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml index 1c266ccae..1609ed17f 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/model/1.3.model.xml @@ -41,6 +41,8 @@ + + diff --git a/ebean-test/testconfig/ebean-db2.properties b/ebean-test/testconfig/ebean-db2.properties index 40e375ef5..4ffab60f1 100644 --- a/ebean-test/testconfig/ebean-db2.properties +++ b/ebean-test/testconfig/ebean-db2.properties @@ -1,5 +1,7 @@ ebean.test.platform=db2 ebean.test.dbName=unit -ebean.test.dbPassword=unit +# we need admin user to call the procedure SYSPROC.ADMIN_MOVE_TABLE +ebean.test.username=admin +ebean.test.password=admin datasource.default=db2-11 ebean.db2-11.databasePlatformName=db2luw From c656436d09c8359b6b6ed56730e98eb6362ee950 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 23 Mar 2022 12:31:22 +1300 Subject: [PATCH 06/17] Update README.md --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.md b/README.md index d324a6276..d82dc5017 100644 --- a/README.md +++ b/README.md @@ -52,3 +52,27 @@ Goto [https://ebean.io/docs/](https://ebean.io/docs/) [Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects") + +## Early access builds + +

+ + ebean EA + + + ebean-datasource EA + + + ebean-migration EA + +

+ +

+ + ebean + + + + ebean-datasource + +

From cc043316ee1b17b44be3c7c0d825ed209b733476 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 23 Mar 2022 13:00:30 +1300 Subject: [PATCH 07/17] Update EA build name --- .github/workflows/jdk-ea.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jdk-ea.yml b/.github/workflows/jdk-ea.yml index 94b202dd4..1784106b6 100644 --- a/.github/workflows/jdk-ea.yml +++ b/.github/workflows/jdk-ea.yml @@ -1,5 +1,5 @@ -name: JDK EA +name: ebean EA on: workflow_dispatch: From 85a971323a59a40e9f7995bc714e4f84a63a11bb Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 23 Mar 2022 13:10:57 +1300 Subject: [PATCH 08/17] Update early access build badges --- README.md | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index d82dc5017..935f1337c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE) [![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml) [![JDK 18-ea](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml) -[![JDK EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml) [![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml) [![Postgres](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml) @@ -12,6 +11,15 @@ [![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml) [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml) + +#### Early access builds + +[![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml) +[![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml) +[![migration EA](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml) +[![test-docker EA](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml) + + # Sponsors @@ -40,39 +48,15 @@
-# Need help? +## Need help? Post questions or issues to the Ebean google group - https://groups.google.com/forum/#!forum/ebean -# Documentation +## Documentation Goto [https://ebean.io/docs/](https://ebean.io/docs/) -## Maven central links: -[Maven central - ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20AND%20a%3A%22ebean%22 "maven central ebean") - -[Maven central - all related projects](http://search.maven.org/#search%7Cga%7C1%7Cebean "maven central all related projects") +## Maven central +[Maven central - io.ebean](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22io.ebean%22%20) -## Early access builds -

- - ebean EA - - - ebean-datasource EA - - - ebean-migration EA - -

- -

- - ebean - - - - ebean-datasource - -

From 1f8a6b0668500226a51ea06db301f19c02ba54c7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 23 Mar 2022 13:16:17 +1300 Subject: [PATCH 09/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 935f1337c..c00cb73e5 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml) -#### Early access builds +#### Builds against EA (Early Access) versions of Java (19, Loom, panama etc) [![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml) [![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml) From d98c49e266f5d5e7fcd1e17c48836b03cd39c1e3 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 23 Mar 2022 22:31:32 +1300 Subject: [PATCH 10/17] Update test generated db2 index migration files --- .../dbmigration/db2fori/idx_db2.migrations | 10 +++++----- .../dbmigration/db2legacy/idx_db2.migrations | 10 +++++----- .../dbmigration/db2luw/idx_db2.migrations | 10 +++++----- .../dbmigration/db2zos/idx_db2.migrations | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations index efd9f0faa..ad7785b1b 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations @@ -1,7 +1,7 @@ --2035307143, 1.0__initial.sql -2129080414, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql -1302478095, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +1873955813, 1.0__initial.sql +1169863904, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +2066110925, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations index 359f08af9..0d7fca8b1 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations @@ -1,7 +1,7 @@ --867624537, 1.0__initial.sql --1885896768, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql --29831669, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +1391889205, 1.0__initial.sql +1929266342, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +-799135439, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations index 27ba5f2fc..1de746cf3 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations @@ -1,8 +1,8 @@ 1307787475, I__create_tablespaces.sql --1520031543, 1.0__initial.sql -1233890256, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql --1775325396, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +-1998060342, 1.0__initial.sql +1201474144, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +-1088179698, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql diff --git a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations index cb4a3dfc1..5eba36e5d 100644 --- a/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations +++ b/ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations @@ -1,7 +1,7 @@ --1520031543, 1.0__initial.sql -1233890256, 1.1.sql -364066694, 1.2__dropsFor_1.1.sql --1775325396, 1.3.sql --1199420632, 1.4__dropsFor_1.3.sql +-1998060342, 1.0__initial.sql +1201474144, 1.1.sql +-1187336846, 1.2__dropsFor_1.1.sql +-1088179698, 1.3.sql +-1713819679, 1.4__dropsFor_1.3.sql 561281075, R__order_views.sql From fcf6f5f384341e04cc2c6cc4f18a560702b607c8 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 11:32:50 +1300 Subject: [PATCH 11/17] No effective change - typo in javadoc --- ebean-api/src/main/java/io/ebean/Database.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 9c69e33fd..15446e999 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -300,7 +300,7 @@ public interface Database { * Create a new instance of T that is an EntityBean. *

* Useful if you use BeanPostConstructListeners or @PostConstruct Annotations. - * In this case you should not use "new Bean...()". Making all bean construtors protected + * In this case you should not use "new Bean...()". Making all bean constructors protected * could be a good idea here. *

*/ From 17f408681c1734d8bb111f0990f459fb63c626af Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 12:01:22 +1300 Subject: [PATCH 12/17] No functional change - final methods on internal RsetDataReader --- .../server/type/RsetDataReader.java | 54 ++++++++-------- .../server/type/TestTypeManager.java | 61 ++++++++----------- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index 574f37615..6469f8346 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -34,28 +34,28 @@ public class RsetDataReader implements DataReader { } @Override - public void pushJson(String json) { + public final void pushJson(String json) { this.json = json; } @Override - public String popJson() { + public final String popJson() { return json; } @Override - public void close() throws SQLException { + public final void close() throws SQLException { rset.close(); } @Override - public boolean next() throws SQLException { + public final boolean next() throws SQLException { pos = 0; return rset.next(); } @Override - public void incrementPos(int increment) { + public final void incrementPos(int increment) { pos += increment; } @@ -64,49 +64,49 @@ public class RsetDataReader implements DataReader { } @Override - public Array getArray() throws SQLException { + public final Array getArray() throws SQLException { return rset.getArray(pos()); } @Override - public Object getObject() throws SQLException { + public final Object getObject() throws SQLException { return rset.getObject(pos()); } @Override - public T getObject(Class cls) throws SQLException { + public final T getObject(Class cls) throws SQLException { return rset.getObject(pos(), cls); } @Override - public BigDecimal getBigDecimal() throws SQLException { + public final BigDecimal getBigDecimal() throws SQLException { return rset.getBigDecimal(pos()); } @Override - public InputStream getBinaryStream() throws SQLException { + public final InputStream getBinaryStream() throws SQLException { return rset.getBinaryStream(pos()); } @Override - public Boolean getBoolean() throws SQLException { + public final Boolean getBoolean() throws SQLException { boolean v = rset.getBoolean(pos()); return rset.wasNull() ? null : v; } @Override - public Byte getByte() throws SQLException { + public final Byte getByte() throws SQLException { byte v = rset.getByte(pos()); return rset.wasNull() ? null : v; } @Override - public byte[] getBytes() throws SQLException { + public final byte[] getBytes() throws SQLException { return rset.getBytes(pos()); } @Override - public Date getDate() throws SQLException { + public final Date getDate() throws SQLException { Calendar cal = dataTimeZone.getDateTimeZone(); if (cal != null) { return rset.getDate(pos(), cal); @@ -116,46 +116,46 @@ public class RsetDataReader implements DataReader { } @Override - public Double getDouble() throws SQLException { + public final Double getDouble() throws SQLException { double v = rset.getDouble(pos()); return rset.wasNull() ? null : v; } @Override - public Float getFloat() throws SQLException { + public final Float getFloat() throws SQLException { float v = rset.getFloat(pos()); return rset.wasNull() ? null : v; } @Override - public Integer getInt() throws SQLException { + public final Integer getInt() throws SQLException { int v = rset.getInt(pos()); return rset.wasNull() ? null : v; } @Override - public Long getLong() throws SQLException { + public final Long getLong() throws SQLException { long v = rset.getLong(pos()); return rset.wasNull() ? null : v; } - public Ref getRef() throws SQLException { + public final Ref getRef() throws SQLException { return rset.getRef(pos()); } @Override - public Short getShort() throws SQLException { + public final Short getShort() throws SQLException { short s = rset.getShort(pos()); return rset.wasNull() ? null : s; } @Override - public String getString() throws SQLException { + public final String getString() throws SQLException { return rset.getString(pos()); } @Override - public Time getTime() throws SQLException { + public final Time getTime() throws SQLException { Calendar cal = dataTimeZone.getTimeZone(); if (cal != null) { return rset.getTime(pos(), cal); @@ -165,7 +165,7 @@ public class RsetDataReader implements DataReader { } @Override - public Timestamp getTimestamp() throws SQLException { + public final Timestamp getTimestamp() throws SQLException { Calendar cal = dataTimeZone.getTimeZone(); if (cal != null) { return rset.getTimestamp(pos(), cal); @@ -175,12 +175,12 @@ public class RsetDataReader implements DataReader { } @Override - public String getStringFromStream() throws SQLException { + public final String getStringFromStream() throws SQLException { Reader reader = rset.getCharacterStream(pos()); return reader == null ? null : readStringLob(reader); } - protected String readStringLob(Reader reader) throws SQLException { + private String readStringLob(Reader reader) throws SQLException { char[] buffer = new char[clobBufferSize]; int readLength; StringBuilder out = new StringBuilder(stringInitialSize); @@ -196,12 +196,12 @@ public class RsetDataReader implements DataReader { } @Override - public byte[] getBinaryBytes() throws SQLException { + public final byte[] getBinaryBytes() throws SQLException { InputStream in = rset.getBinaryStream(pos()); return getBinaryLob(in); } - protected byte[] getBinaryLob(InputStream in) throws SQLException { + private byte[] getBinaryLob(InputStream in) throws SQLException { if (in == null) { return null; } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index 94aa02e3d..d46c0afef 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -3,6 +3,7 @@ package io.ebeaninternal.server.type; import io.ebean.BaseTestCase; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; import io.ebean.server.type.MyDayOfWeek; import io.ebean.server.type.MyEnum; @@ -21,21 +22,26 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -public class TestTypeManager extends BaseTestCase { +class TestTypeManager extends BaseTestCase { @Test - public void testEnumWithSubclasses() throws SQLException { - + void testEnumWithSubclasses() throws SQLException { DefaultTypeManager typeManager = createTypeManager(); ScalarType type = typeManager.createEnumScalarType(MyEnum.class, null); - Object val = type.read(new DummyDataReader("A")); + DataReader reader = mock(DataReader.class); + when(reader.getString()).thenReturn("A"); + Object val = type.read(reader); assertThat(val).isEqualTo(MyEnum.Aval); - val = type.read(new DummyDataReader("B")); + when(reader.getString()).thenReturn("B"); + val = type.read(reader); assertThat(val).isEqualTo(MyEnum.Bval); - val = type.read(new DummyDataReader("C")); + when(reader.getString()).thenReturn("C"); + val = type.read(reader); assertThat(val).isEqualTo(MyEnum.Cval); ScalarType typeGeneral = typeManager.getScalarType(MyEnum.class); @@ -56,25 +62,29 @@ public class TestTypeManager extends BaseTestCase { } @Test - public void testEnumWithChar() throws SQLException { - + void testEnumWithChar() throws SQLException { DefaultTypeManager typeManager = createTypeManager(); ScalarType dayOfWeekType = typeManager.createEnumScalarType(MyDayOfWeek.class, null); - - Object val = dayOfWeekType.read(new DummyDataReader("MONDAY ")); + DataReader reader = mock(DataReader.class); + when(reader.getString()).thenReturn("MONDAY "); + Object val = dayOfWeekType.read(reader); assertThat(val).isEqualTo(MyDayOfWeek.MONDAY); - val = dayOfWeekType.read(new DummyDataReader("TUESDAY ")); + when(reader.getString()).thenReturn("TUESDAY "); + val = dayOfWeekType.read(reader); assertThat(val).isEqualTo(MyDayOfWeek.TUESDAY); - val = dayOfWeekType.read(new DummyDataReader("WEDNESDAY")); + when(reader.getString()).thenReturn("WEDNESDAY"); + val = dayOfWeekType.read(reader); assertThat(val).isEqualTo(MyDayOfWeek.WEDNESDAY); - val = dayOfWeekType.read(new DummyDataReader("THURSDAY ")); + when(reader.getString()).thenReturn("THURSDAY "); + val = dayOfWeekType.read(reader); assertThat(val).isEqualTo(MyDayOfWeek.THURSDAY); - val = dayOfWeekType.read(new DummyDataReader("FRIDAY ")); + when(reader.getString()).thenReturn("FRIDAY "); + val = dayOfWeekType.read(reader); assertThat(val).isEqualTo(MyDayOfWeek.FRIDAY); try { @@ -86,7 +96,7 @@ public class TestTypeManager extends BaseTestCase { } @Test - public void test() { + void test() { DefaultTypeManager typeManager = createTypeManager(); ScalarType scalarType = typeManager.getScalarType(Money.class); @@ -96,7 +106,7 @@ public class TestTypeManager extends BaseTestCase { } @Test - public void testWithConfig() { + void testWithConfig() { DefaultTypeManager typeManager1 = createTypeManager(); ScalarType type1 = typeManager1.createEnumScalarType(MySex.class, null); assertThat(type1).isInstanceOf(ScalarTypeEnumStandard.OrdinalEnum.class); @@ -132,27 +142,10 @@ public class TestTypeManager extends BaseTestCase { } @Test - public void testCalendar() throws SQLException { - + void testCalendar() { DefaultTypeManager typeManager = createTypeManager(); ScalarType typeB = typeManager.getScalarType(GregorianCalendar.class); assertThat(typeB).isInstanceOf(ScalarTypeCalendar.class); } - /** - * Test double DataReader implementation. - */ - private static class DummyDataReader extends RsetDataReader { - String val; - - DummyDataReader(String val) { - super(null, null); - this.val = val; - } - - @Override - public String getString() throws SQLException { - return val; - } - } } From e6ea85a1937cb6dbf2806aaca3dcf31ba5ea2eae Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 16:51:18 +1300 Subject: [PATCH 13/17] #2609 - Fix module-info export io.ebean.config.dbplatform.yugabyte --- ebean-api/src/main/java9/module-info.java | 3 ++- ebean-core/src/main/java9/module-info.java | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ebean-api/src/main/java9/module-info.java b/ebean-api/src/main/java9/module-info.java index 56243dbd1..75ff243e2 100644 --- a/ebean-api/src/main/java9/module-info.java +++ b/ebean-api/src/main/java9/module-info.java @@ -10,13 +10,13 @@ module io.ebean.api { requires transitive java.sql; requires transitive io.avaje.config; + requires transitive io.avaje.lang; requires transitive persistence.api; requires transitive io.ebean.annotation; requires transitive io.ebean.datasource.api; requires transitive org.slf4j; requires static io.ebean.types; - requires static io.avaje.jsr305x; requires static com.fasterxml.jackson.core; requires static javax.servlet.api; requires static com.h2database; @@ -41,6 +41,7 @@ module io.ebean.api { exports io.ebean.config.dbplatform.sqlanywhere; exports io.ebean.config.dbplatform.sqlite; exports io.ebean.config.dbplatform.sqlserver; + exports io.ebean.config.dbplatform.yugabyte; exports io.ebean.event; exports io.ebean.event.readaudit; exports io.ebean.event.changelog; diff --git a/ebean-core/src/main/java9/module-info.java b/ebean-core/src/main/java9/module-info.java index bc518b421..398a43d87 100644 --- a/ebean-core/src/main/java9/module-info.java +++ b/ebean-core/src/main/java9/module-info.java @@ -38,13 +38,13 @@ module io.ebean.core { requires static org.postgresql.jdbc; requires static joda.time; - exports io.ebeaninternal.api; exports io.ebeaninternal.server.cache; - // export these for io.ebean.ddl.generator (but that becomes unnamed module in maven test scope) - exports io.ebeaninternal.server.deploy; - exports io.ebeaninternal.server.deploy.visitor; -// exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator; -// exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator; + + exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test; + exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator; + exports io.ebeaninternal.server.deploy.id to io.ebean.ddl.generator; + exports io.ebeaninternal.server.deploy.meta to io.ebean.ddl.generator; + exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator; exports io.ebeaninternal.server.el to io.ebean.autotune; exports io.ebeaninternal.server.autotune to io.ebean.autotune; From f270c52c00af102af11e6c709ae8e7670c93303c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 16:58:41 +1300 Subject: [PATCH 14/17] Bump maven-compiler-plugin --- kotlin-querybean-generator/pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/test-java16/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 716c2ddde..0b0c54764 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -133,7 +133,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 default-testCompile diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 1b93b331a..779301f10 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.2 + 3.10.1 1.8 1.8 diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 2442f48fb..05dbdff26 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -12,7 +12,7 @@ 1.0 - 3.8.1 + 3.10.1 true From f58d6038c7800737d09b08d05812f079b15d7eea Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 18:21:48 +1300 Subject: [PATCH 15/17] Move some unit tests from ebean-test back to ebean-core --- .../json/ModifyAwareMapTest.java | 0 .../server/cache/DefaultCacheHolderTest.java | 0 .../cache/DefaultServerCacheConfigTest.java | 0 .../server/cache/DefaultServerCacheTest.java | 0 .../DefaultServerCache_RunEvictionTest.java | 0 .../server/core/BasicTypeConverterTest.java | 3 +- .../server/core/BindPaddingTest.java | 0 .../server/core/DtoQueryRequestTest.java | 3 +- .../server/core/InitDataSourceTest.java | 12 +++---- .../core/bootup/DistillPackagesTest.java | 0 .../core/bootup/ManifestReaderTest.java | 0 .../server/deploy/BeanCascadeInfoTest.java | 0 .../server/deploy/BeanIudMetricsTest.java | 0 .../deploy/DeployPropertyParserMapTests.java | 0 .../server/deploy/DetermineAggPathTest.java | 3 +- .../server/deploy/IndexDefinitionTest.java | 3 +- .../server/deploy/TableJoinColumnTest.java | 0 .../server/deploy/TableJoinTest.java | 0 .../GeneratedCounterLongTest.java | 34 +++++++++++++++++++ .../GeneratedInsertJavaTimeTest.java | 0 .../InsertTimestampFactoryTest.java | 0 .../UpdateTimestampFactoryTest.java | 0 .../deploy/parse/AnnotationClassTest.java | 0 .../server/dto/DtoMetaBuilderTest.java | 5 +-- .../DefaultBackgroundExecutorTest.java | 11 +++--- .../platform/H2DbExpressionTest.java | 0 .../platform/HanaDbExpressionTest.java | 0 .../platform/MySqlDbExpressionTest.java | 0 .../platform/OracleDbExpressionTest.java | 0 .../expression/platform/PostgresCastTest.java | 3 +- .../platform/PostgresDbExpressionTest.java | 0 .../server/grammer/ParseFetchConfigTest.java | 0 .../server/persist/BatchDepthOrderTest.java | 0 .../profile/BasicProfileLocationTest.java | 0 .../server/profile/DTimedMetricMapTest.java | 0 .../server/profile/DTimedMetricTest.java | 0 .../server/profile/SortMetricTest.java | 0 .../server/profile/UtilLocationTest.java | 3 +- .../server/query/DbOrderByTrimTest.java | 3 +- .../server/query/OrderVersionDescTest.java | 0 .../server/query/RawSqlQueryPlanKeyTest.java | 0 .../server/query/SqlTreeAliasTest.java | 0 .../server/query/SqlTreeBuilderTest.java | 3 +- .../server/querydefn/BindValuesKeyTest.java | 0 .../querydefn/OrmQueryDetailParserTest.java | 3 +- .../OrmQueryPropertiesParserTest.java | 0 .../querydefn/OrmQueryPropertiesTest.java | 0 .../querydefn/OrmUpdatePropertiesTest.java | 3 +- .../server/rawsql/ColumnMappingTest.java | 0 .../server/rawsql/DRawSqlServiceTest.java | 0 .../server/rawsql/RawSqlKeyTest.java | 1 + .../rawsql/TestRawSqlColumnParsing.java | 12 +++++++ .../server/rawsql/TestRawSqlService.java | 4 +-- .../server/transaction/TableModStateTest.java | 0 .../server/util/ArrayStackTest.java | 0 .../server/util/BindParamsParserTest.java | 0 .../server/util/ChecksumTest.java | 0 .../server/util/DSelectColumnsParserTest.java | 0 .../io/ebeaninternal/server/util/Md5Test.java | 0 .../java/org/tests/model/basic/Contact.java | 4 +++ .../java/org/tests/model/basic/Customer.java | 4 +++ .../META-INF/test/test-agent-only-use.mf | 0 .../resources/META-INF/test/test-combined.mf | 0 .../META-INF/test/test-entity-packages.mf | 0 .../test/resources/META-INF/test/test-one.mf | 0 .../test/resources/META-INF/test/test-some.mf | 0 .../ebean/event/BeanFindControllerTest.java | 5 +-- .../io/ebean/text/PathPropertiesTests.java | 3 +- .../DocStoreBeanBaseAdapterTest.java | 11 +++--- .../docstore}/DocStoreDeleteEventTest.java | 3 +- .../docstore}/DocStoreIndexEventTest.java | 3 +- .../xtest/internal}/api/BindParamsTest.java | 3 +- .../internal}/api/HelpScopeTransTest.java | 3 +- .../internal}/api/PlatformMatchTest.java | 6 ++-- .../xtest/internal}/api/TDSpiEbeanServer.java | 3 +- .../xtest/internal}/api/TDSpiServer.java | 2 +- .../model/ExtraDdlXmlReaderTest.java | 4 ++- .../BinaryTransactionEventReadWriteTest.java | 4 +-- .../TestShutdownWithBackgroundTasks.java | 2 +- .../server/grammer/EqlParserTest.java | 3 +- .../server/idgen/TestUuidGenerator.java | 17 ++++------ .../server/lib/ShutdownManagerTest.java | 2 +- .../internal}/server/persist/FlagsTest.java | 3 +- .../server/persist/TrimLogSqlTest.java | 6 ++-- .../server/query/DefaultSqlRowTest.java | 3 +- .../query/LimitOffsetPagedListTest.java | 34 +++++++++---------- .../internal}/server/query/SplitNameTest.java | 2 +- .../TestFutureRowCountErrorHandling.java | 5 ++- .../server/rawsql/TestRawSqlBuilder.java | 13 ++----- .../rawsql/TestRawSqlBuilderDistinct.java | 3 +- .../server/rawsql/TestRawSqlParsing.java | 3 +- .../server/text/json/DJsonScalarTest.java | 3 +- .../text/json/TestJsonWriteVisitor.java | 2 +- .../json/TestTextJsonBeanReadVisitor.java | 2 +- .../server/text/json/WriteJsonDirtyTest.java | 3 +- .../server/text/json/WriteJsonTest.java | 2 +- .../DefaultPersistenceContextTest.java | 16 +++++---- .../DefaultProfileHandlerTest.java | 2 +- .../DefaultTransactionThreadLocalTest.java | 2 +- .../transaction/JdbcTransactionTest.java | 2 +- .../RemoteTransactionEventTest.java | 4 ++- .../transaction/TransactionManagerTest.java | 3 +- .../server/transaction/TransactionTest.java | 12 ++++--- .../DbMigrationDropHistoryTest.java | 5 +-- .../dbmigration/DbMigrationGenerateTest.java | 4 +-- .../dbmigration/DbMigrationTest.java | 5 +-- .../deploy/BeanDescriptor_registerTest.java | 3 +- .../deploy/DeployPropertyParserTest.java | 31 ++++++++--------- .../GeneratedCounterLongTest.java | 34 ------------------- .../expression/AllEqualsExpressionTest.java | 9 +++-- .../server/expression/SameTest.java | 3 +- .../test/java/misc/migration/v1_0/EBasic.java | 20 +++-------- .../java/misc/migration/v1_0/EHistory.java | 10 +++--- .../java/misc/migration/v1_0/EQuoted.java | 6 ++-- .../test/java/misc/migration/v1_0/ETable.java | 13 ++----- .../java/misc/migration/v1_1/EHistory.java | 6 +--- .../test/java/misc/migration/v1_1/ETable.java | 13 ++----- .../java/misc/migration/v1_1/MtmChild.java | 5 ++- .../java/misc/migration/v1_1/MtmMaster.java | 9 ++--- .../test/java/misc/migration/v1_2/EBasic.java | 15 ++------ .../java/misc/migration/v1_2/EHistory.java | 10 +++--- .../java/misc/migration/v1_2/EQuoted.java | 6 ++-- .../test/java/misc/migration/v1_2/ETable.java | 13 ++----- .../basic/TestDeleteImportedPartial.java | 4 +-- .../org/tests/basic/TestDeleteOneToOne.java | 4 +-- .../basic/TestDeleteOneToOneMultiple.java | 4 +-- .../java/org/tests/basic/TestIUDVanilla.java | 4 +-- .../org/tests/basic/TestLoadBeanCache.java | 3 +- .../tests/basic/TestSaveDeleteOneToOne.java | 4 +-- .../basic/TestSaveDeleteOneToOneMultiple.java | 4 +-- .../org/tests/cache/TestBeanCacheAsync.java | 23 ++++++------- .../java/org/tests/cache/TestQueryCache.java | 5 +-- .../TestConstructorPutfieldReplacement.java | 4 +-- .../java/org/tests/idkeys/db/GenKeySeqB.java | 10 ++---- .../java/org/tests/json/TestJsonMapBasic.java | 1 - .../lazyforeignkeys/MainEntityRelation.java | 6 ++-- .../tests/model/basic/EBasicClobNoVer.java | 8 +---- .../tests/model/basic/relates/Relation1.java | 12 ++++--- .../tests/model/basic/relates/Relation3.java | 8 ++--- .../java/org/tests/model/join/HAccess.java | 11 ++---- .../org/tests/model/m2m/TestM2MWithWhere.java | 1 - .../tests/model/onetoone/OtoChildVersion.java | 19 ++++------- .../model/onetoone/OtoMasterVersion.java | 19 ++++------- .../onetoone/TestOneToOneCascadeSave.java | 19 +++++------ .../org/tests/text/csv/TestCsvReader.java | 3 +- .../text/csv/TestCsvReaderWithCallback.java | 1 - .../org/tests/text/json/TestJsonSimple.java | 6 ++-- .../text/json/TestTextJsonReferenceBean.java | 3 +- 148 files changed, 339 insertions(+), 383 deletions(-) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java (88%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java (85%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java (99%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java (87%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java (92%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java (100%) create mode 100644 ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java (92%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java (99%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java (86%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java (83%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java (94%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java (93%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java (97%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java (70%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java (97%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java (86%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java (98%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebeaninternal/server/util/Md5Test.java (100%) create mode 100644 ebean-core/src/test/java/org/tests/model/basic/Contact.java create mode 100644 ebean-core/src/test/java/org/tests/model/basic/Customer.java rename {ebean-test => ebean-core}/src/test/resources/META-INF/test/test-agent-only-use.mf (100%) rename {ebean-test => ebean-core}/src/test/resources/META-INF/test/test-combined.mf (100%) rename {ebean-test => ebean-core}/src/test/resources/META-INF/test/test-entity-packages.mf (100%) rename {ebean-test => ebean-core}/src/test/resources/META-INF/test/test-one.mf (100%) rename {ebean-test => ebean-core}/src/test/resources/META-INF/test/test-some.mf (100%) rename ebean-test/src/test/java/io/{ebeanservice/docstore/api/support => ebean/xtest/docstore}/DocStoreBeanBaseAdapterTest.java (84%) rename ebean-test/src/test/java/io/{ebeanservice/docstore/api/support => ebean/xtest/docstore}/DocStoreDeleteEventTest.java (94%) rename ebean-test/src/test/java/io/{ebeanservice/docstore/api/support => ebean/xtest/docstore}/DocStoreIndexEventTest.java (95%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/api/BindParamsTest.java (93%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/api/HelpScopeTransTest.java (93%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/api/PlatformMatchTest.java (90%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/api/TDSpiEbeanServer.java (99%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/api/TDSpiServer.java (99%) rename ebean-test/src/test/java/io/{ebeaninternal/extraddl => ebean/xtest/internal}/model/ExtraDdlXmlReaderTest.java (89%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java (97%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/executor/TestShutdownWithBackgroundTasks.java (96%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/grammer/EqlParserTest.java (99%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/idgen/TestUuidGenerator.java (94%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/lib/ShutdownManagerTest.java (97%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/persist/FlagsTest.java (95%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/persist/TrimLogSqlTest.java (68%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/query/DefaultSqlRowTest.java (83%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/query/LimitOffsetPagedListTest.java (61%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/query/SplitNameTest.java (97%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/query/TestFutureRowCountErrorHandling.java (92%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/rawsql/TestRawSqlBuilder.java (93%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/rawsql/TestRawSqlBuilderDistinct.java (87%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/rawsql/TestRawSqlParsing.java (98%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/text/json/DJsonScalarTest.java (95%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/text/json/TestJsonWriteVisitor.java (98%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/text/json/TestTextJsonBeanReadVisitor.java (97%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/text/json/WriteJsonDirtyTest.java (94%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/text/json/WriteJsonTest.java (94%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/DefaultPersistenceContextTest.java (95%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/DefaultProfileHandlerTest.java (89%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/DefaultTransactionThreadLocalTest.java (98%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/JdbcTransactionTest.java (98%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/RemoteTransactionEventTest.java (82%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/TransactionManagerTest.java (95%) rename ebean-test/src/test/java/io/{ebeaninternal => ebean/xtest/internal}/server/transaction/TransactionTest.java (81%) delete mode 100644 ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java rename to ebean-core/src/test/java/io/ebeaninternal/json/ModifyAwareMapTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultCacheHolderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheConfigTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCacheTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/cache/DefaultServerCache_RunEvictionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java similarity index 88% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java index 0cb2018aa..c2f2c91b2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/BasicTypeConverterTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.core; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -9,7 +10,7 @@ public class BasicTypeConverterTest { @Test public void toBoolean_when_1_long() throws Exception { - assertTrue(BasicTypeConverter.toBoolean(1L, "T")); + Assertions.assertTrue(BasicTypeConverter.toBoolean(1L, "T")); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/BindPaddingTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java similarity index 85% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java index c78eafa93..169587916 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/DtoQueryRequestTest.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.core; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,7 +11,7 @@ public class DtoQueryRequestTest { @Test public void testParse() { - assertEquals("foo", DtoQueryRequest.parseColumn("foo")); + Assertions.assertEquals("foo", DtoQueryRequest.parseColumn("foo")); assertEquals("bar", DtoQueryRequest.parseColumn("zx__t0_bar")); assertEquals("BAR", DtoQueryRequest.parseColumn("ZX__T0_BAR")); assertEquals("baz", DtoQueryRequest.parseColumn("zx__t42_baz")); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java index eb501029e..89fb432f6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/core/InitDataSourceTest.java @@ -4,16 +4,14 @@ import io.ebean.config.DatabaseConfig; import io.ebean.datasource.DataSourceAlert; import io.ebean.datasource.DataSourceConfig; import io.ebean.datasource.pool.ConnectionPool; - import org.junit.jupiter.api.Test; +import javax.sql.DataSource; +import java.sql.SQLException; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -import java.sql.SQLException; - -import javax.sql.DataSource; - public class InitDataSourceTest { private DatabaseConfig newConfig(String readOnlyUrl) { @@ -129,8 +127,8 @@ public class InitDataSourceTest { assertNotNull(roConfig); assertEquals("foo", roConfig.getUrl()); } - - + + @Test public void online() { DatabaseConfig config = new DatabaseConfig(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/DistillPackagesTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/core/bootup/ManifestReaderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java similarity index 87% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java index c1e4d32ff..ef36b62f2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/DetermineAggPathTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.deploy; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class DetermineAggPathTest { @Test public void path() throws Exception { - assertThat(DetermineAggPath.path("count(details)")).isEqualTo("details"); + Assertions.assertThat(DetermineAggPath.path("count(details)")).isEqualTo("details"); assertThat(DetermineAggPath.path("count(details )")).isEqualTo("details"); assertThat(DetermineAggPath.path("count(person.contacts)")).isEqualTo("person.contacts"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java index aadc88109..fc8763c61 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/IndexDefinitionTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.deploy; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,7 +15,7 @@ public class IndexDefinitionTest { @Test public void isUniqueConstraint_TRUE_when_simpleMultiColumn() { - assertTrue(new IndexDefinition(simpleCol1).isUniqueConstraint()); + Assertions.assertTrue(new IndexDefinition(simpleCol1).isUniqueConstraint()); assertTrue(new IndexDefinition(simpleCol2).isUniqueConstraint()); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinColumnTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/TableJoinTest.java diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java new file mode 100644 index 000000000..783981a75 --- /dev/null +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java @@ -0,0 +1,34 @@ +package io.ebeaninternal.server.deploy.generatedproperty; + +import io.ebeaninternal.server.deploy.BeanProperty; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + + +class GeneratedCounterLongTest { + + private final GeneratedCounterLong counter = new GeneratedCounterLong(); + + @Test + void when_null_expect_IllegalStateException() { + BeanProperty beanProperty = mock(BeanProperty.class); + when(beanProperty.getValue(any())).thenReturn(null); + + assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(beanProperty, null, System.currentTimeMillis())); + } + + @Test + void when_set_expect_incremented() { + BeanProperty beanProperty = mock(BeanProperty.class); + when(beanProperty.getValue(any())).thenReturn(7L); + + Object value = counter.getUpdateValue(beanProperty, null, System.currentTimeMillis()); + assertThat(value).isEqualTo(8L); + } + +} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedInsertJavaTimeTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactoryTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/deploy/parse/AnnotationClassTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java index bd75d835c..a3cf2a2fd 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/dto/DtoMetaBuilderTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.dto; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.lang.reflect.Method; @@ -34,7 +35,7 @@ public class DtoMetaBuilderTest { Map methods = getIncludedMethodsFor(D0.class); assertThat(methods).hasSize(2); - assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class); + Assertions.assertThat(DtoMetaProperty.propertyClass(methods.get("setName"))).isEqualTo(String.class); assertThat(DtoMetaProperty.propertyClass(methods.get("setId"))).isEqualTo(long.class); assertThat(DtoMetaProperty.propertyType(methods.get("setName"))).isEqualTo(String.class); assertThat(DtoMetaProperty.propertyType(methods.get("setId"))).isEqualTo(long.class); @@ -43,7 +44,7 @@ public class DtoMetaBuilderTest { @Test public void propertyName() { - assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name"); + Assertions.assertThat(DtoMetaBuilder.propertyName("setName")).isEqualTo("name"); assertThat(DtoMetaBuilder.propertyName("setId")).isEqualTo("id"); assertThat(DtoMetaBuilder.propertyName("setI")).isEqualTo("i"); assertThat(DtoMetaBuilder.propertyName("setfoo")).isEqualTo("foo"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java index cc3a3d481..d320f46c0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/executor/DefaultBackgroundExecutorTest.java @@ -1,11 +1,10 @@ package io.ebeaninternal.server.executor; +import io.ebean.config.MdcBackgroundExecutorWrapper; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.MDC; -import io.ebean.config.MdcBackgroundExecutorWrapper; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -109,18 +108,18 @@ public class DefaultBackgroundExecutorTest { es.submit(()->{ assertThat(MDC.get("hello")).isNull(); }).get(); - + MDC.put("hello", "there"); es.wrap(() -> { assertThat(MDC.get("hello")).isEqualTo("there"); }).run(); // will clear the MDC. But this should be OK - + MDC.put("hello", "there"); es.wrap(() -> { assertThat(MDC.get("hello")).isEqualTo("there"); return "Callable"; }).call(); // will clear the MDC. But this should be OK - + MDC.put("hello", "there"); CountDownLatch latch = new CountDownLatch(1); @@ -136,7 +135,7 @@ public class DefaultBackgroundExecutorTest { return "Callable"; }).get(); MDC.clear(); - + es.execute(()->{ assertThat(MDC.get("hello")).isNull(); }); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/H2DbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/HanaDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/MySqlDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/OracleDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java similarity index 86% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java index 80c0ccff0..986a3c808 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresCastTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.expression.platform; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class PostgresCastTest { @Test public void cast() { - assertThat(PostgresCast.cast(1)).isEqualTo("::integer"); + Assertions.assertThat(PostgresCast.cast(1)).isEqualTo("::integer"); assertThat(PostgresCast.cast(1L)).isEqualTo("::bigint"); assertThat(PostgresCast.cast(1.0D)).isEqualTo("::decimal"); assertThat(PostgresCast.cast("")).isEqualTo(""); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/expression/platform/PostgresDbExpressionTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/grammer/ParseFetchConfigTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/persist/BatchDepthOrderTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java similarity index 83% rename from ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java index 12f1edcd9..778379c59 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/UtilLocationTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.profile; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +9,7 @@ public class UtilLocationTest { @Test public void label() { - assertThat(UtilLocation.label("foo")).isEqualTo("foo"); + Assertions.assertThat(UtilLocation.label("foo")).isEqualTo("foo"); assertThat(UtilLocation.label("ProfileLocationTest$Other.")).isEqualTo("ProfileLocationTest$Other.init"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java index 1f918c97d..14f4a1733 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/DbOrderByTrimTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,7 +20,7 @@ public class DbOrderByTrimTest { } private void test(String value, String suffix) { - assertEquals(value, DbOrderByTrim.trim(value + suffix)); + Assertions.assertEquals(value, DbOrderByTrim.trim(value + suffix)); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/OrderVersionDescTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/RawSqlQueryPlanKeyTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeAliasTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java index 6a03ea57f..ff4ccc332 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/query/SqlTreeBuilderTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,7 +9,7 @@ public class SqlTreeBuilderTest { @Test public void mergeOnDistinct_equal() { - assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.id"), "t0.id"); + Assertions.assertEquals(SqlTreeBuilder.mergeOnDistinct("t0.id", "t0.id"), "t0.id"); } @Test diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/BindValuesKeyTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java index d6354f9a0..2bdafcbdc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParserTest.java @@ -1,13 +1,12 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -public class OrmQueryDetailParserTest extends BaseTestCase { +public class OrmQueryDetailParserTest { OrmQueryDetail parse(String query) { return new OrmQueryDetailParser(query).parse(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java similarity index 70% rename from ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java index da7e95299..d01589962 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/querydefn/OrmUpdatePropertiesTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.querydefn; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,7 +9,7 @@ public class OrmUpdatePropertiesTest { @Test public void trim() { - assertEquals("ship_id", OrmUpdateProperties.trim("${}ship_id")); + Assertions.assertEquals("ship_id", OrmUpdateProperties.trim("${}ship_id")); assertEquals("(ship_id)", OrmUpdateProperties.trim("(${}ship_id)")); } } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/ColumnMappingTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/DRawSqlServiceTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java index b46714a99..3faddba2d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/RawSqlKeyTest.java @@ -3,6 +3,7 @@ package io.ebeaninternal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import io.ebeaninternal.server.rawsql.SpiRawSql; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java similarity index 86% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java index 6cf39f216..08291108e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlColumnParsing.java @@ -2,14 +2,26 @@ package io.ebeaninternal.server.rawsql; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; public class TestRawSqlColumnParsing { + @Test + public void testDeriveProperty() { + Assertions.assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some_other")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.some_other")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.someOther")).isEqualTo("someOther"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some")).isEqualTo("some"); + assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "someOther")).isEqualTo("someOther"); + } + @Test public void test_simple() { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java rename to ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java index 5e2f415c5..1d4cf2441 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlService.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.rawsql; -import io.ebean.BaseTestCase; import io.ebean.SqlRow; +import io.ebeaninternal.server.rawsql.DRawSqlService; import org.junit.jupiter.api.Test; import java.sql.ResultSet; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class TestRawSqlService extends BaseTestCase { +public class TestRawSqlService { @Test public void testDistinctColumnNames() throws SQLException { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/transaction/TableModStateTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/ArrayStackTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/BindParamsParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/ChecksumTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/DSelectColumnsParserTest.java diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java b/ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java similarity index 100% rename from ebean-test/src/test/java/io/ebeaninternal/server/util/Md5Test.java rename to ebean-core/src/test/java/io/ebeaninternal/server/util/Md5Test.java diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-core/src/test/java/org/tests/model/basic/Contact.java new file mode 100644 index 000000000..5c1e0cc8e --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/Contact.java @@ -0,0 +1,4 @@ +package org.tests.model.basic; + +public class Contact { +} diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-core/src/test/java/org/tests/model/basic/Customer.java new file mode 100644 index 000000000..0b0202301 --- /dev/null +++ b/ebean-core/src/test/java/org/tests/model/basic/Customer.java @@ -0,0 +1,4 @@ +package org.tests.model.basic; + +public class Customer { +} diff --git a/ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf b/ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-agent-only-use.mf rename to ebean-core/src/test/resources/META-INF/test/test-agent-only-use.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-combined.mf b/ebean-core/src/test/resources/META-INF/test/test-combined.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-combined.mf rename to ebean-core/src/test/resources/META-INF/test/test-combined.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf b/ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-entity-packages.mf rename to ebean-core/src/test/resources/META-INF/test/test-entity-packages.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-one.mf b/ebean-core/src/test/resources/META-INF/test/test-one.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-one.mf rename to ebean-core/src/test/resources/META-INF/test/test-one.mf diff --git a/ebean-test/src/test/resources/META-INF/test/test-some.mf b/ebean-core/src/test/resources/META-INF/test/test-some.mf similarity index 100% rename from ebean-test/src/test/resources/META-INF/test/test-some.mf rename to ebean-core/src/test/resources/META-INF/test/test-some.mf diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java index 94be03769..f95f5ed91 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java @@ -18,10 +18,7 @@ import org.tests.model.controller.TestBeanFindController; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class BeanFindControllerTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java index f366a6d1d..042fb1b58 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -5,7 +5,6 @@ import io.ebean.DB; import io.ebean.FetchPath; import io.ebean.Query; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -215,7 +214,7 @@ public class PathPropertiesTests extends BaseTestCase { String asJson = DB.json().toJson(list, pathProps); log.info("Json: {}", asJson); } - + @Test public void test_withAllPropsQuery() { PathProperties root = PathProperties.parse("*,billingAddress(line1)"); diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java similarity index 84% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java index 30708eda0..212c41bb5 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.BaseTestCase; @@ -9,12 +9,13 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeanservice.docstore.api.DocStoreUpdateContext; +import io.ebeanservice.docstore.api.support.DocStoreBeanBaseAdapter; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import java.io.IOException; -import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class DocStoreBeanBaseAdapterTest extends BaseTestCase { @@ -31,9 +32,9 @@ public class DocStoreBeanBaseAdapterTest extends BaseTestCase { TDAdapter adapter = new TDAdapter<>(orderDesc, deployDesc); - assertThat(adapter.indexName()).isEqualTo("order"); - assertThat(adapter.indexType()).isEqualTo("order"); - assertThat(adapter.getQueueId()).isEqualTo("order"); + Assertions.assertThat(adapter.indexName()).isEqualTo("order"); + Assertions.assertThat(adapter.indexType()).isEqualTo("order"); + Assertions.assertThat(adapter.getQueueId()).isEqualTo("order"); } static class TDAdapter extends DocStoreBeanBaseAdapter { diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java index 3c10ee57e..1a626481c 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreDeleteEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreDeleteEventTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.DB; import io.ebean.Database; @@ -6,6 +6,7 @@ import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.support.DocStoreDeleteEvent; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java index e353f1a01..241642e90 100644 --- a/ebean-test/src/test/java/io/ebeanservice/docstore/api/support/DocStoreIndexEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreIndexEventTest.java @@ -1,4 +1,4 @@ -package io.ebeanservice.docstore.api.support; +package io.ebean.xtest.docstore; import io.ebean.DB; import io.ebean.Database; @@ -6,6 +6,7 @@ import io.ebean.DocStoreQueueEntry; import io.ebean.plugin.BeanDocType; import io.ebean.plugin.BeanType; import io.ebeanservice.docstore.api.DocStoreUpdates; +import io.ebeanservice.docstore.api.support.DocStoreIndexEvent; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java index 1a9a52669..beea174a2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/BindParamsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/BindParamsTest.java @@ -1,5 +1,6 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; +import io.ebeaninternal.api.BindParams; import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java index 51a46d3bf..d7bb51473 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/HelpScopeTransTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/HelpScopeTransTest.java @@ -1,7 +1,8 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.ebean.DB; import io.ebean.TxScope; +import io.ebeaninternal.api.HelpScopeTrans; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java index d20108a20..35980dc93 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/PlatformMatchTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/PlatformMatchTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.ebean.annotation.Platform; +import io.ebeaninternal.api.PlatformMatch; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -12,7 +14,7 @@ public class PlatformMatchTest { @Test public void match() { - assertTrue(PlatformMatch.matchPlatform(Platform.H2, "h2")); + Assertions.assertTrue(PlatformMatch.matchPlatform(Platform.H2, "h2")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql,h2")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql,h2,")); assertTrue(PlatformMatch.matchPlatform(Platform.H2, "mysql , h2 ,")); diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index d4b0e4b20..de0e61945 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.avaje.lang.NonNullApi; import io.ebean.*; @@ -17,6 +17,7 @@ import io.ebean.plugin.Property; import io.ebean.plugin.SpiServer; import io.ebean.text.csv.CsvReader; import io.ebean.text.json.JsonContext; +import io.ebeaninternal.api.*; import io.ebeaninternal.api.SpiQuery.Type; import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.core.timezone.DataTimeZone; diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 2cf23625b..f1b06631d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.api; +package io.ebean.xtest.internal.api; import io.avaje.lang.NonNullApi; import io.ebean.*; diff --git a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java index a0bd66adb..49d6a553a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/model/ExtraDdlXmlReaderTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.extraddl.model; +package io.ebean.xtest.internal.model; import io.ebean.annotation.Platform; +import io.ebeaninternal.extraddl.model.ExtraDdl; +import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 61956ace5..7f8c2231a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,8 +1,8 @@ -package io.ebeaninternal.server.cluster.binarymessage; +package io.ebean.xtest.internal.server.cluster.binarymessage; import io.ebean.BaseTestCase; import io.ebean.EbeanServer; -import io.ebeaninternal.api.TDSpiEbeanServer; +import io.ebean.xtest.internal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; import io.ebeaninternal.server.cache.RemoteCacheEvent; import io.ebeaninternal.server.cluster.BinaryTransactionEventReader; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java similarity index 96% rename from ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java index 9a45dad71..97f71318a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.executor; +package io.ebean.xtest.internal.server.executor; import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java index 89201f9a7..366b5ec6a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.grammer; +package io.ebean.xtest.internal.server.grammer; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -8,6 +8,7 @@ import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.grammer.EqlParser; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java index f311dff3a..12c477564 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/idgen/TestUuidGenerator.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/idgen/TestUuidGenerator.java @@ -2,29 +2,24 @@ * Licensed Materials - Property of FOCONIS AG * (C) Copyright FOCONIS AG. */ -package io.ebeaninternal.server.idgen; +package io.ebean.xtest.internal.server.idgen; import io.ebean.config.dbplatform.PlatformIdGenerator; - +import io.ebeaninternal.server.idgen.UuidV1IdGenerator; +import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator; +import io.ebeaninternal.server.idgen.UuidV4IdGenerator; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.Map; import java.util.Properties; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.within; +import static org.assertj.core.api.Assertions.*; /** * Run some simple tests for the UUID generator. diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java index f07ffe3a6..3cd0582fc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/lib/ShutdownManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.lib; +package io.ebean.xtest.internal.server.lib; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java index 5c1f8c879..dfabbaada 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/FlagsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/FlagsTest.java @@ -1,6 +1,7 @@ -package io.ebeaninternal.server.persist; +package io.ebean.xtest.internal.server.persist; +import io.ebeaninternal.server.persist.Flags; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java similarity index 68% rename from ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java index b9bf22ae9..2ec81e806 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/persist/TrimLogSqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/persist/TrimLogSqlTest.java @@ -1,5 +1,7 @@ -package io.ebeaninternal.server.persist; +package io.ebean.xtest.internal.server.persist; +import io.ebeaninternal.server.persist.TrimLogSql; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -8,7 +10,7 @@ public class TrimLogSqlTest { @Test public void trim() { - assertThat(TrimLogSql.trim("hello")).isEqualTo("hello"); + Assertions.assertThat(TrimLogSql.trim("hello")).isEqualTo("hello"); assertThat(TrimLogSql.trim("hello\nthere")).isEqualTo("hello\\n there"); assertThat(TrimLogSql.trim("a\nb\nc\nd")).isEqualTo("a\\n b\\n c\\n d"); assertThat(TrimLogSql.trim("a\n\nb")).isEqualTo("a\\n \\n b"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java similarity index 83% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java index 3d33ca922..ee1ee4fa6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/DefaultSqlRowTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/DefaultSqlRowTest.java @@ -1,5 +1,6 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; +import io.ebeaninternal.server.query.DefaultSqlRow; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java similarity index 61% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java index 3286c7e4b..6c110457b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java @@ -1,85 +1,85 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; +import io.ebeaninternal.server.query.LimitOffsetPagedList; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import static org.junit.jupiter.api.Assertions.assertEquals; - public class LimitOffsetPagedListTest extends BaseTestCase { private SpiEbeanServer server = spiEbeanServer(); @Test public void getPageIndex_when_firstRowsZero() { - assertEquals(limit(0, 10).getPageIndex(), 0); + Assertions.assertEquals(limit(0, 10).getPageIndex(), 0); } @Test public void getPageIndex_when_10_10() { - assertEquals(limit(10, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(10, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_20_10() { - assertEquals(limit(20, 10).getPageIndex(), 2); + Assertions.assertEquals(limit(20, 10).getPageIndex(), 2); } @Test public void getPageIndex_when_1_10() { - assertEquals(limit(1, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(1, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_9_10() { - assertEquals(limit(1, 10).getPageIndex(), 1); + Assertions.assertEquals(limit(1, 10).getPageIndex(), 1); } @Test public void getPageIndex_when_10_4() { - assertEquals(limit(10, 4).getPageIndex(), 3); + Assertions.assertEquals(limit(10, 4).getPageIndex(), 3); } @Test public void getPageIndex_when_10_5() { - assertEquals(limit(10, 5).getPageIndex(), 2); + Assertions.assertEquals(limit(10, 5).getPageIndex(), 2); } @Test public void getPageIndex_when_10_9() { - assertEquals(limit(10, 9).getPageIndex(), 2); + Assertions.assertEquals(limit(10, 9).getPageIndex(), 2); } @Test public void getPageIndex_when_10_11() { - assertEquals(limit(10, 11).getPageIndex(), 1); + Assertions.assertEquals(limit(10, 11).getPageIndex(), 1); } @Test public void getPageIndex_when_21_10() { - assertEquals(limit(21, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(21, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_29_10() { - assertEquals(limit(29, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(29, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_30_10() { - assertEquals(limit(30, 10).getPageIndex(), 3); + Assertions.assertEquals(limit(30, 10).getPageIndex(), 3); } @Test public void getPageIndex_when_31_10() { - assertEquals(limit(31, 10).getPageIndex(), 4); + Assertions.assertEquals(limit(31, 10).getPageIndex(), 4); } @Test public void getPageIndex_when_40_10() { - assertEquals(limit(40, 10).getPageIndex(), 4); + Assertions.assertEquals(limit(40, 10).getPageIndex(), 4); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java index 7351ab2f4..fce38554a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/SplitNameTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/SplitNameTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.util.SplitName; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java similarity index 92% rename from ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java index 194d92aa0..bd44347c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java @@ -1,6 +1,9 @@ -package io.ebeaninternal.server.query; +package io.ebean.xtest.internal.server.query; import io.ebean.*; +import io.ebeaninternal.server.query.QueryFutureIds; +import io.ebeaninternal.server.query.QueryFutureList; +import io.ebeaninternal.server.query.QueryFutureRowCount; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java similarity index 93% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java index c4fa0d4c9..5af99b4ef 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java @@ -1,10 +1,11 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -25,16 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; public class TestRawSqlBuilder extends BaseTestCase { - @Test - public void testDeriveProperty() { - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName("item_total", "some_other")).isEqualTo("itemTotal"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some_other")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.some_other")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "alias.someOther")).isEqualTo("someOther"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "some")).isEqualTo("some"); - assertThat(SpiRawSql.ColumnMapping.Column.derivePropertyName(null, "someOther")).isEqualTo("someOther"); - } - private Sql getSql(String sqlStatement) { RawSql r = RawSqlBuilder.parse(sqlStatement).create(); return ((SpiRawSql) r).getSql(); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java similarity index 87% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java index 7ea56e68f..6111930f7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlBuilderDistinct.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilderDistinct.java @@ -1,7 +1,8 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java index 70914dace..faaf7638d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java @@ -1,8 +1,9 @@ -package io.ebeaninternal.server.rawsql; +package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java index a7a24f512..b05eb5ff6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/DJsonScalarTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/DJsonScalarTest.java @@ -1,10 +1,11 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.text.json.DJsonScalar; import io.ebeaninternal.server.type.DefaultTypeManager; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java index 054269e66..880c62c7e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java similarity index 97% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java index 682e76363..825b0bf1d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.BaseTestCase; import io.ebean.DB; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java index faf74d993..8b41dad56 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonDirtyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonDirtyTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; @@ -6,6 +6,7 @@ import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.text.json.WriteJson; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java index ec9514c72..b27351f2f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/text/json/WriteJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/WriteJsonTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.text.json; +package io.ebean.xtest.internal.server.text.json; import io.ebean.DB; import io.ebean.FetchPath; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java index 236d3a2fc..6879eb0ba 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultPersistenceContextTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultPersistenceContextTest.java @@ -1,9 +1,13 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.server.deploy.PersistenceContextUtil; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; import org.junit.jupiter.api.Test; -import org.tests.model.basic.*; +import org.tests.model.basic.Car; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.model.basic.Vehicle; import static org.assertj.core.api.Assertions.assertThat; @@ -173,17 +177,17 @@ class DefaultPersistenceContextTest { pc.beginIterate(); assertThat(pc.size(Customer.class)).isEqualTo(100); assertThat(pc.size(Contact.class)).isEqualTo(1010); - + addCustomers(pc, 200, 100); addContacts(pc, 2000, 1010); - + assertThat(pc.size(Customer.class)).isEqualTo(200); assertThat(pc.size(Contact.class)).isEqualTo(2020); pc.endIterate(); - + System.gc(); Thread.sleep(50); // give the GC some time - + assertThat(pc.size(Customer.class)).isEqualTo(100); assertThat(pc.size(Contact.class)).isEqualTo(1010); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java index 758ee8964..fad77a311 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultProfileHandlerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultProfileHandlerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java index 9fe2386c7..0e6a66f31 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.*; import io.ebean.annotation.ForPlatform; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java index ac3eeacf9..ce9e420b8 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/JdbcTransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/JdbcTransactionTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java similarity index 82% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java index db62950e7..905118c47 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/RemoteTransactionEventTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/RemoteTransactionEventTest.java @@ -1,6 +1,8 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebeaninternal.server.cache.RemoteCacheEvent; +import io.ebeaninternal.server.transaction.RemoteTableMod; +import io.ebeaninternal.server.transaction.RemoteTransactionEvent; import org.junit.jupiter.api.Test; import java.util.Collections; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java index d567fc8f7..e7f70f66c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java @@ -1,4 +1,4 @@ -package io.ebeaninternal.server.transaction; +package io.ebean.xtest.internal.server.transaction; import io.ebean.BaseTestCase; import io.ebean.DB; @@ -8,6 +8,7 @@ import io.ebeaninternal.api.ScopedTransaction; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.api.SpiTransactionManager; +import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java similarity index 81% rename from ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java index c4bb4aafd..6d104dc70 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/transaction/TransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java @@ -1,11 +1,15 @@ -package io.ebeaninternal.server.transaction; - -import io.ebean.*; +package io.ebean.xtest.internal.server.transaction; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Transaction; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.tests.model.basic.relates.*; +import org.tests.model.basic.relates.Relation1; +import org.tests.model.basic.relates.Relation2; +import org.tests.model.basic.relates.Relation3; +import org.tests.model.basic.relates.Relation4; class TransactionTest extends BaseTestCase { diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java index fce49b1dc..4fa963827 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationDropHistoryTest.java @@ -3,6 +3,7 @@ package io.ebeaninternal.dbmigration; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,9 +37,9 @@ public class DbMigrationDropHistoryTest { @Test public void lastVersion_no_v_Prefix() { File d = new File("src/test/resources/migrationtest-history/dbmigration"); - assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2"); + Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.2"); } - + public static void main(String[] args) throws IOException { logger.info("start"); diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java index d8b6a729e..82b74862d 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationGenerateTest.java @@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; *
  • misc.migration.v1_1 modified v1_0 - every migration change, that ebean supports should be done here. *
  • misc.migration.v1_2 This is (nearly) the same as v1_0 and simulates every migration change in the other way * - * + * * Changes in the migration scripts should be committed after they are reviewed (changes may be legitime or show, that something is broken). * The {@link DbMigrationTest} will execute the generated scripts for various platforms. * @author Roland Praml, FOCONIS AG @@ -64,7 +64,7 @@ public class DbMigrationGenerateTest { // for platforms like DB2-LUW, we specify the exact platform in the migration path // see https://github.com/ebean-orm/ebean-migration/issues/102 migration.addPlatform(Platform.DB2LUW, "db2luw"); - migration.addPlatform(Platform.DB2FORI, "db2fori"); + migration.addPlatform(Platform.DB2FORI, "db2fori"); migration.addPlatform(Platform.DB2ZOS, "db2zos"); migration.addPlatform(Platform.DB2, "db2legacy"); migration.addPlatform(Platform.GENERIC); 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 16c017c69..51115c8c3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -9,6 +9,7 @@ import io.ebean.datasource.pool.ConnectionPool; import misc.migration.v1_0.ETable; import misc.migration.v1_1.EHistory; import misc.migration.v1_1.EHistory2; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.io.File; @@ -45,7 +46,7 @@ public class DbMigrationTest extends BaseTestCase { @Test public void lastVersion() { File d = new File("src/test/resources/migrationtest/dbmigration/h2"); - assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4"); + Assertions.assertThat(LastMigration.lastVersion(d, null)).isEqualTo("1.4"); assertThat(LastMigration.nextVersion(d, null, false)).isEqualTo("1.5"); assertThat(LastMigration.nextVersion(d, null, true)).isEqualTo("1.4"); } @@ -100,7 +101,7 @@ public class DbMigrationTest extends BaseTestCase { if (isSqlServer() || isMariaDB() || isMySql() || isHana()) { runScript("I__create_procs.sql"); } - + if(isDb2()) { runScript("I__create_tablespaces.sql"); } diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java index 13a25e08a..8ee34d246 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_registerTest.java @@ -6,6 +6,7 @@ import io.ebean.event.AbstractBeanPersistListener; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistListener; import io.ebeaninternal.api.SpiEbeanServer; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; @@ -46,7 +47,7 @@ public class BeanDescriptor_registerTest { Controller2 controller2 = new Controller2(); desc.register(controller2); - assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size()); + Assertions.assertEquals(2, ((ChainedBeanPersistController) desc.persistController()).size()); desc.deregister(controller1); assertEquals(1, ((ChainedBeanPersistController) desc.persistController()).size()); diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index 4ca2a3681..76462d577 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -3,13 +3,12 @@ package io.ebeaninternal.server.deploy; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; import org.tests.model.basic.BWithQIdent; import org.tests.model.basic.Customer; -import static org.assertj.core.api.Assertions.assertThat; - public class DeployPropertyParserTest extends BaseTestCase { @@ -21,67 +20,67 @@ public class DeployPropertyParserTest extends BaseTestCase { @Test public void from_prefix_expect_unchanged() { - assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)"); + Assertions.assertThat(parser().parse("(select x from status join status)")).isEqualTo("(select x from status join status)"); } @Test public void depth0_path() { - assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post"); + Assertions.assertThat(parser().parse("pre status post")).isEqualTo("pre ${}status post"); } @Test public void depth1_path() { - assertThat(parser().parse("billingAddress.city")).isEqualTo("${billingAddress}city"); + Assertions.assertThat(parser().parse("billingAddress.city")).isEqualTo("${billingAddress}city"); } @Test public void depth2_path() { - assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)"); + Assertions.assertThat(parser().parse("max(billingAddress.country.name)")).isEqualTo("max(${billingAddress.country}name)"); } @Test public void simpleMax() { - assertThat(parser().parse("max(name)")).isEqualTo("max(${}name)"); + Assertions.assertThat(parser().parse("max(name)")).isEqualTo("max(${}name)"); } @Test public void combined() { - assertThat(parser().parse("sum(status * name)")).isEqualTo("sum(${}status * ${}name)"); + Assertions.assertThat(parser().parse("sum(status * name)")).isEqualTo("sum(${}status * ${}name)"); } @Test public void combined_withAtColumn() { - assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')"); + Assertions.assertThat(addressParser().parse("concat(line1, line2, '-EA')")).isEqualTo("concat(${}line_1, ${}line_2, '-EA')"); } @Test public void withExplicitQuote_all_platforms() { - assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?"); - assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?"); - assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.`CODE` like ?")).isEqualTo("t0.`CODE` like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.[CODE] like ?")).isEqualTo("t0.[CODE] like ?"); + Assertions.assertThat(withQuoteParser().parse("t0.\"CODE\" like ?")).isEqualTo("t0.\"CODE\" like ?"); } @Test @ForPlatform({Platform.H2, Platform.POSTGRES}) public void withQuote_when_match_h2() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}\"Name\" like ?"); } @Test @ForPlatform(Platform.SQLSERVER) public void withQuote_when_match_sqlserver() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}[Name] like ?"); } @Test @ForPlatform(Platform.MYSQL) public void withQuote_when_match_mysql() { - assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?"); + Assertions.assertThat(withQuoteParser().parse("name like ?")).isEqualTo("${}`Name` like ?"); } @Test public void unknown_path() { - assertThat(parser().parse(" foo ")).isEqualTo(" foo "); + Assertions.assertThat(parser().parse(" foo ")).isEqualTo(" foo "); } private DeployPropertyParser parser() { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java deleted file mode 100644 index 403fc3d8d..000000000 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/generatedproperty/GeneratedCounterLongTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.ebeaninternal.server.deploy.generatedproperty; - -import io.ebean.BaseTestCase; -import io.ebean.bean.EntityBean; -import io.ebeaninternal.server.deploy.BeanProperty; -import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; - - -public class GeneratedCounterLongTest extends BaseTestCase { - - private GeneratedCounterLong counter = new GeneratedCounterLong(); - - private BeanProperty version = getBeanDescriptor(Customer.class).beanProperty("version"); - - @Test - public void when_null_expect_IllegalStateException() { - Customer customer = new Customer(); - assertThrows(IllegalStateException.class, () -> counter.getUpdateValue(version, (EntityBean)customer, System.currentTimeMillis())); - } - - @Test - public void when_set_expect_incremented() { - Customer customer = new Customer(); - customer.setVersion(7L); - Object value = counter.getUpdateValue(version, (EntityBean) customer, System.currentTimeMillis()); - - assertThat(value).isEqualTo(8L); - } - -} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java index 43fd9126b..32780f20f 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/AllEqualsExpressionTest.java @@ -1,12 +1,11 @@ package io.ebeaninternal.server.expression; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.assertj.core.api.Assertions.assertThat; - public class AllEqualsExpressionTest extends BaseExpressionTest { @Test @@ -18,7 +17,7 @@ public class AllEqualsExpressionTest extends BaseExpressionTest { @Test public void isSameByBind_when_sameMultiple() { - assertThat(exp("a", 10, "b", "23").isSameByBind(exp("a", 10, "b", "23"))).isTrue(); + Assertions.assertThat(exp("a", 10, "b", "23").isSameByBind(exp("a", 10, "b", "23"))).isTrue(); } @Test @@ -78,13 +77,13 @@ public class AllEqualsExpressionTest extends BaseExpressionTest { @Test public void isSameByBind_when_diffBindByNull_last() { - assertThat(exp("a", 10).isSameByBind(exp("a", null))).isFalse(); + Assertions.assertThat(exp("a", 10).isSameByBind(exp("a", null))).isFalse(); } @Test public void isSameByBind_when_diffBindByNull_first() { - assertThat(exp("a", null).isSameByBind(exp("a", 10))).isFalse(); + Assertions.assertThat(exp("a", null).isSameByBind(exp("a", 10))).isFalse(); } private AllEqualsExpression exp(Map propMap) { diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java index 76e3d27a3..3b6f26d7e 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/SameTest.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.expression; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +11,7 @@ public class SameTest { @Test public void sameByNull() throws Exception { - assertThat(Same.sameByNull("a", "a")).isTrue(); + Assertions.assertThat(Same.sameByNull("a", "a")).isTrue(); assertThat(Same.sameByNull("a", "b")).isTrue(); assertThat(Same.sameByNull(null, null)).isTrue(); assertThat(Same.sameByNull("a", null)).isFalse(); diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index e8d8f0763..9bc8ee032 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -1,20 +1,10 @@ package misc.migration.v1_0; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; -import io.ebean.annotation.Tablespace; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.io.File; import java.sql.Timestamp; import java.util.List; @@ -22,7 +12,7 @@ import java.util.List; @Entity @Table(name = "migtest_e_basic") // Note: tablespaces are currently only supported for DB2 -// to be prepared for future (when we support sql server filegroups), +// to be prepared for future (when we support sql server filegroups), // we allow to specify the DB-platform here @Tablespace(value = "db2;TSTABLES;", index = "db2;INDEXTS;") public class EBasic { @@ -52,7 +42,7 @@ public class EBasic { @Size(max=127) String description; - + @Lob @Column(columnDefinition = "db2;blob(64M);") File descriptionFile; @@ -60,7 +50,7 @@ public class EBasic { @DbJson @Column(columnDefinition = "db2;clob(16K) inline length 500 compact;") List jsonList; - + @NotNull @DbDefault("X") @Column(columnDefinition = "db2;clob(16K) inline length 500 not logged;") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index ec2381650..fc659f270 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -1,20 +1,20 @@ package misc.migration.v1_0; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Tablespace; - @Entity @Table(name = "migtest_e_history") @Tablespace("db2;MAIN;") public class EHistory { - + @Id Integer id; - - + + String testString; } diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java index 116094997..964f76605 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -1,12 +1,12 @@ package misc.migration.v1_0; +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; - // table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java index 7dfd5948e..dce7920af 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_0; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index a8773205d..d7f1829c5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -1,11 +1,7 @@ package misc.migration.v1_1; -import io.ebean.annotation.DbComment; -import io.ebean.annotation.DbMigration; -import io.ebean.annotation.History; -import io.ebean.annotation.Platform; -import io.ebean.annotation.Tablespace; +import io.ebean.annotation.*; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java index cbca4b4b2..6372c9233 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_1; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History // FIXME: remove later diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 3ba02c2a5..344ebb4df 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -1,12 +1,11 @@ package misc.migration.v1_1; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.Table; - -import io.ebean.annotation.Tablespace; - import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 3c132c2c9..4507821be 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -1,13 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; - import io.ebean.annotation.Tablespace; +import javax.persistence.*; import java.util.List; @Entity @@ -25,7 +20,7 @@ public class MtmMaster { @ElementCollection List phoneNumbers; - + public Long getId() { return id; } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index b80603673..75246ce3e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -1,19 +1,10 @@ package misc.migration.v1_2; -import io.ebean.annotation.DbDefault; -import io.ebean.annotation.DbJson; -import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import io.ebean.annotation.NotNull; +import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import javax.persistence.*; import javax.validation.constraints.Size; - import java.io.File; import java.sql.Timestamp; import java.util.List; @@ -47,7 +38,7 @@ public class EBasic { @Size(max=127) String description; - + @Lob @Column(columnDefinition = "db2;blob(64M);") File descriptionFile; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index ab2fbdf33..e4d0e9506 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -1,20 +1,20 @@ package misc.migration.v1_2; +import io.ebean.annotation.Tablespace; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.Tablespace; - @Entity @Table(name = "migtest_e_history") @Tablespace("db2;MAIN;") public class EHistory { - + @Id Integer id; - - + + Long testString; // keep it as long as history prevents altering } diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java index 6832092bf..38ae02730 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -1,12 +1,12 @@ package misc.migration.v1_2; +import io.ebean.annotation.EnumValue; +import io.ebean.annotation.Index; + import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import io.ebean.annotation.EnumValue; -import io.ebean.annotation.Index; - //table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java index 4fff00ce3..6192e7f71 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java @@ -1,19 +1,12 @@ package misc.migration.v1_2; -import java.util.List; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import io.ebean.annotation.DbComment; import io.ebean.annotation.History; import io.ebean.annotation.Index; +import javax.persistence.*; +import java.util.List; + @Table(name = "`table`") @Entity @History diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index 4729929c9..b873d3be6 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteImportedPartial extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index 98b837db2..a31a70666 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteOneToOne extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index af51fdec5..18ba4d2ab 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNull; + public class TestDeleteOneToOneMultiple extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index f69f38669..b493a23e7 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -10,9 +10,7 @@ import javax.persistence.OptimisticLockException; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; public class TestIUDVanilla extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index a72f07264..920b94ed5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -3,7 +3,6 @@ package org.tests.basic; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; import org.tests.model.basic.Customer; @@ -13,7 +12,7 @@ import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertSame; class TestLoadBeanCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index f17c9862a..2d8ad58b4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; import org.tests.model.basic.PersistentFileContent; -import static org.junit.jupiter.api.Assertions.assertNotNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestSaveDeleteOneToOne extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index b357445e5..d32899dfb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -6,10 +6,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertNotNull; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestSaveDeleteOneToOneMultiple extends BaseTestCase { // public void testCreateDeletePFile() { diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java index a08e30f0f..059fd9a6d 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java @@ -1,13 +1,5 @@ package org.tests.cache; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.util.concurrent.Callable; - -import org.junit.jupiter.api.Test; -import org.tests.model.basic.OCachedBean; - import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; @@ -17,9 +9,16 @@ import io.ebean.config.CurrentTenantProvider; import io.ebean.config.DatabaseConfig; import io.ebean.config.MdcBackgroundExecutorWrapper; import io.ebeaninternal.server.cache.DefaultServerCachePlugin; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.OCachedBean; + +import java.util.concurrent.Callable; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** - * Test class testing async/background cache updates in a multi-tenant environment. + * Test class testing async/background cache updates in a multi-tenant environment. */ public class TestBeanCacheAsync extends BaseTestCase { @@ -63,7 +62,7 @@ public class TestBeanCacheAsync extends BaseTestCase { }; } } - + @Test public void findById_with_tenant() throws InterruptedException { DatabaseConfig config = new DatabaseConfig(); @@ -81,7 +80,7 @@ public class TestBeanCacheAsync extends BaseTestCase { config.setBackgroundExecutorWrapper( new MdcBackgroundExecutorWrapper().with(new TenantCopyBackgroundExecutorWrapper())); tenantId.set("4711"); - + Database db = DatabaseFactory.create(config); try { OCachedBean bean = new OCachedBean(); @@ -95,7 +94,7 @@ public class TestBeanCacheAsync extends BaseTestCase { db.save(bean0); Thread.sleep(100); // TODO: can we block finds on that ID if a pending cache update is present? - + bean0 = db.find(OCachedBean.class, bean.getId()); assertNotNull(bean0); assertThat(bean0.getName()).isEqualTo("findById2"); diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index f127101f9..5a5b06fc0 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -16,10 +16,7 @@ import java.util.List; import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestQueryCache extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index 0b82b7c33..ac4adb358 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; import org.tests.model.basic.PFileContent; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.nio.charset.StandardCharsets; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestConstructorPutfieldReplacement extends BaseTestCase { @Test diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java index 91a94d2e0..474e4902a 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java @@ -1,21 +1,17 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import javax.persistence.*; @Entity public class GenKeySeqB { public final static String SEQUENCE_NAME = "GEN_KEY_B_SEQ_NAME"; - + private final static String SEQ_GEN_NAME = "SEQ_GEN_NAME"; /** * {@link GeneratedValue#generator()} links to {@link SequenceGenerator#name()}. - * The name of the sequence is {@link SequenceGenerator#sequenceName()}. + * The name of the sequence is {@link SequenceGenerator#sequenceName()}. */ @Id @SequenceGenerator(name = SEQ_GEN_NAME, sequenceName = GenKeySeqB.SEQUENCE_NAME) diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index 5ee67e02b..39971b716 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -7,7 +7,6 @@ import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.json.EJson; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMap; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 19d2bfd48..8f36be0cb 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -1,11 +1,9 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; - -import javax.persistence.*; - import org.tests.model.basic.Cat; +import javax.persistence.*; import java.util.UUID; @@ -25,7 +23,7 @@ public class MainEntityRelation { @JoinColumn(name = "id2") @DbForeignKey(noConstraint = true) private MainEntity entity2; - + @ManyToOne @JoinColumn(name = "cat_id") @DbForeignKey(noConstraint = true) diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java index 680fdf169..410b0cbf3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,12 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.OneToMany; - - +import javax.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java index ba3d3cbf2..e49d35903 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java @@ -1,12 +1,14 @@ package org.tests.model.basic.relates; -import java.util.UUID; - -import javax.persistence.*; - import io.ebean.annotation.ChangeLog; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import java.util.UUID; + /** * Relation entity */ @@ -60,5 +62,5 @@ public class Relation1 { public void setWithCascade(Relation2 withCascade) { this.withCascade = withCascade; } - + } diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java index 826e3564e..249d137e4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java @@ -1,12 +1,12 @@ package org.tests.model.basic.relates; -import java.util.UUID; - -import javax.persistence.*; - import io.ebean.annotation.ChangeLog; +import javax.persistence.Entity; +import javax.persistence.Id; +import java.util.UUID; + /** * Relation entity */ diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccess.java b/ebean-test/src/test/java/org/tests/model/join/HAccess.java index e62484d96..d0d0608f1 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccess.java @@ -1,15 +1,10 @@ package org.tests.model.join; -import java.util.UUID; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; - import io.ebean.annotation.DbForeignKey; +import javax.persistence.*; +import java.util.UUID; + @Inheritance @Entity public abstract class HAccess { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index 62dff12e4..a6449bbca 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -3,7 +3,6 @@ package org.tests.model.m2m; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java index 96539b0ea..f64a6a81e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java @@ -1,17 +1,10 @@ package org.tests.model.onetoone; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; - import io.ebean.annotation.Where; +import javax.persistence.*; +import java.util.List; + @Entity public class OtoChildVersion { @@ -25,12 +18,12 @@ public class OtoChildVersion { @Version int version; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "ref_id") @Where(clause = "${mta}.type=1") List notifications; - + public Integer getId() { return id; } @@ -54,7 +47,7 @@ public class OtoChildVersion { public void setMaster(OtoMasterVersion master) { this.master = master; } - + public int getVersion() { return version; } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java index 2339d0f09..aa26d4ad5 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java @@ -1,17 +1,10 @@ package org.tests.model.onetoone; -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Version; - import io.ebean.annotation.Where; +import javax.persistence.*; +import java.util.List; + @Entity public class OtoMasterVersion { @@ -25,12 +18,12 @@ public class OtoMasterVersion { @Version int version; - + @OneToMany(cascade = CascadeType.ALL) @JoinColumn(name = "ref_id") @Where(clause = "${mta}.type=0") List notifications; - + public Long getId() { return id; } @@ -62,5 +55,5 @@ public class OtoMasterVersion { public void setVersion(int version) { this.version = version; } - + } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index e4875af11..088d98c9d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -3,7 +3,6 @@ package org.tests.model.onetoone; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; - import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -32,7 +31,7 @@ public class TestOneToOneCascadeSave extends BaseTestCase { OtoMaster master2 = child2.getMaster(); assertNotNull(master2); } - + @Test public void testSaveCascadeWithOneToOne() { OtoMasterVersion master = new OtoMasterVersion(); @@ -40,19 +39,19 @@ public class TestOneToOneCascadeSave extends BaseTestCase { OtoChildVersion child = new OtoChildVersion(); child.setName("c1"); - + master.setChild(child); DB.save(master); - + assertThat(master.getVersion()).isEqualTo(1); assertThat(child.getVersion()).isEqualTo(1); - + child.setName("c2"); DB.save(master); - + assertThat(master.getVersion()).isEqualTo(1); assertThat(child.getVersion()).isEqualTo(2); - + try (Transaction txn = DB.beginTransaction()) { master = DB.find(OtoMasterVersion.class).findOne(); @@ -61,10 +60,10 @@ public class TestOneToOneCascadeSave extends BaseTestCase { child = DB.find(OtoChildVersion.class).findOne(); assertThat(child.getVersion()).isEqualTo(2); child.setName("c3"); - DB.save(child); - + DB.save(child); + txn.commit(); } } - + } diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java index e8cb48160..fc02c2133 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -4,7 +4,6 @@ import io.ebean.DB; import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -37,7 +36,7 @@ public class TestCsvReader extends TransactionalTestCase { csvReader.addProperty("billingAddress.country.code"); csvReader.process(reader); - + } } diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index efa424d07..af2ccd4a3 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -5,7 +5,6 @@ import io.ebean.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java index b95c889e7..d0bf62f9c 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -5,10 +5,12 @@ import io.ebean.DB; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; import io.ebean.util.IOUtils; - import org.junit.jupiter.api.Test; -import java.io.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.LineNumberReader; +import java.io.Reader; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index 95ce27683..d140b46d7 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -17,7 +17,8 @@ import org.tests.model.basic.ResetBasicData; import java.io.IOException; import java.util.List; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestTextJsonReferenceBean extends BaseTestCase { From e4c06432a092e4f1c788dc5d1f7209a12feb2724 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 18:48:59 +1300 Subject: [PATCH 16/17] Move some more unit tests from ebean-test back to ebean-core --- .../io/ebean/text/PathPropertiesTests.java | 44 +--------------- .../UnderscoreNamingConventionTest.java | 1 + .../dbplatform/DatabasePlatformTest.java | 41 +-------------- .../dbplatform/DbPlatformTypeLookupTest.java | 6 ++- .../dbplatform/DbPlatformTypeParserTest.java | 2 + .../config/dbplatform/MySqlPlatformTest.java | 1 + .../config/dbplatform/OraclePlatformTest.java | 1 + .../dbplatform/PostgresPlatformTest.java | 2 + .../io/ebean/util/CamelCaseHelperTest.java | 0 .../java/io/ebean/util/TestEncodeB64.java | 0 .../src/test/java/io/ebean/BaseTestCase.java | 1 + .../src/test/java/io/ebean/PropertyTest.java | 44 ---------------- .../{server/type => xtest}/MyDayOfWeek.java | 2 +- .../ebean/{server/type => xtest}/MyEnum.java | 2 +- .../ebean/{server/type => xtest}/MySex.java | 2 +- .../io/ebean/{ => xtest/base}/ColumnTest.java | 2 +- .../ebean/{ => xtest/base}/DtoQuery2Test.java | 5 +- .../{ => xtest/base}/DtoQueryFromOrmTest.java | 6 ++- .../ebean/{ => xtest/base}/DtoQueryTest.java | 6 ++- .../EbeanServerFactory_MultiTenancy_Test.java | 5 +- ...nServerFactory_ServerConfigStart_Test.java | 4 +- .../base}/EbeanServer_deleteAllByIdTest.java | 6 ++- .../base}/EbeanServer_deleteByIdTest.java | 6 ++- .../base}/EbeanServer_deleteTest.java | 8 ++- .../{ => xtest/base}/EbeanServer_eqlTest.java | 5 +- .../{ => xtest/base}/EbeanServer_refresh.java | 4 +- .../base}/EbeanServer_saveAllTest.java | 6 ++- .../{ => xtest/base}/ExtendedServerTest.java | 3 +- .../{ => xtest/base}/FetchConfigTest.java | 3 +- .../{ => xtest/base}/FetchGroupTest.java | 5 +- .../base}/MyCurrentUserProvider.java | 2 +- .../{ => xtest/base}/PlatformCondition.java | 3 +- .../io/ebean/xtest/base/PropertyTest.java | 46 +++++++++++++++++ .../{ => xtest/base}/SqlRowBooleanTest.java | 6 ++- .../{ => xtest/base}/StringHelperTest.java | 2 +- .../{ => xtest/base}/TestDirtyProperties.java | 4 +- .../{ => xtest/base}/TestFilterWithEnum.java | 5 +- .../base}/TestUnsetLoadedProperties.java | 5 +- .../base}/TextExpressionListTest.java | 3 +- .../base}/TransactionalTestCase.java | 4 +- .../ebean/{ => xtest/base}/TxScopeTest.java | 3 +- .../{ => xtest/base}/UpdateQueryTest.java | 3 +- .../bean/EntityBeanInterceptTest.java | 4 +- .../ebean/{ => xtest}/cache/CacheKeyTest.java | 3 +- .../cache/ServerCacheManagerTest.java | 4 +- .../cache/ServerCacheOptionsTest.java | 3 +- .../{ => xtest}/common/BeanListTest.java | 3 +- .../ebean/{ => xtest}/common/BeanMapTest.java | 3 +- .../ebean/{ => xtest}/common/BeanSetTest.java | 3 +- .../config/ContainerConfigTest.java | 3 +- .../config/DatabaseConfigTest.java | 11 ++-- .../config/DbConstraintNamingTest.java | 3 +- .../config/DbMigrationConfigTest.java | 3 +- .../config/DocStoreConfigTest.java | 4 +- .../config/MatchingNamingConventionTest.java | 5 +- .../config/PlatformNoGeneratedKeysTest.java | 3 +- .../config/PropertiesWrapperTest.java | 3 +- .../config/ServerConfigSqlServerTest.java | 3 +- .../{ => xtest}/config/TestTableName.java | 3 +- .../dbplatform/BasicSqlLimitOffsetTest.java | 3 +- .../BasicSqlStandardLimiterTest.java | 3 +- .../dbplatform/DatabasePlatformBaseTest.java | 49 ++++++++++++++++++ .../config/dbplatform/DbIdentityTest.java | 3 +- .../dbplatform/DbPlatformTypeMappingTest.java | 4 +- .../config/dbplatform/DbTypeMapTest.java | 4 +- .../dbplatform/HanaHistorySupportTest.java | 2 +- .../config/dbplatform/HanaPlatformTest.java | 3 +- .../dbplatform/MySqlHistorySupportTest.java | 2 +- .../PostgresHistorySupportTest.java | 2 +- .../SequenceBatchIdGeneratorTest.java | 16 +++--- .../dbplatform/SqlserverPlatformTest.java | 3 +- .../sqlserver/SqlServer2016PlatformTest.java | 4 +- .../sqlserver/SqlServerStepSequenceTest.java | 3 +- .../event/BeanFindControllerTest.java | 4 +- .../event/BeanPersistControllerTest.java | 5 +- .../{ => xtest}/event/BeanPostLoadTest.java | 3 +- .../readaudit/ReadAuditQueryPlanTest.java | 3 +- .../io/ebean/{ => xtest}/json/EJsonTests.java | 2 +- .../json/JsonBeanReaderTest.java | 5 +- .../{text => xtest}/json/JsonContextTest.java | 5 +- .../json/JsonWriteOptionsTests.java | 3 +- .../{ => xtest}/plugin/BeanTypeTest.java | 5 +- .../plugin/ExpressionPathTest.java | 4 +- .../{ => xtest}/plugin/PropertyTest.java | 4 +- .../{ => xtest}/plugin/SpiServerTest.java | 4 +- .../ebean/xtest/text/PathPropertiesTests.java | 51 +++++++++++++++++++ .../server/type/TestTypeManager.java | 6 +-- .../tests/basic/TestDeleteByIdCollection.java | 2 +- .../tests/basic/TestOrderByAnnotation.java | 2 +- .../org/tests/basic/TestWhereAnnotation.java | 2 +- .../tests/basic/join/TestSecondaryJoin.java | 2 +- .../tests/basic/type/TestInetAddressType.java | 2 +- .../batchinsert/TestBatchInsertFlush.java | 1 + .../TestLazyLoadEmptyCollection.java | 2 +- .../tests/batchload/TestSecondaryQueries.java | 2 +- .../org/tests/generated/TestGeneratedWho.java | 2 +- .../java/org/tests/order/TestOrderColumn.java | 2 +- .../other/TestFindWhereUsingEnumerated.java | 2 +- .../tests/query/other/TestLikeEscaping.java | 2 +- .../softdelete/TestSoftDeletePagingList.java | 2 +- .../tests/refresh/TestRefreshWithMany.java | 2 +- .../org/tests/text/csv/TestCsvReader.java | 2 +- .../text/csv/TestCsvReaderWithCallback.java | 2 +- .../text/json/TestTextJsonUpdateCascade.java | 2 +- .../org/tests/update/TestStatelessUpdate.java | 2 +- .../src/test/resources/ebean.properties | 2 +- 106 files changed, 386 insertions(+), 229 deletions(-) rename {ebean-test => ebean-api}/src/test/java/io/ebean/text/PathPropertiesTests.java (81%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java (97%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java (72%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java (87%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java (94%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java (94%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java (96%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java (97%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/util/CamelCaseHelperTest.java (100%) rename {ebean-test => ebean-core}/src/test/java/io/ebean/util/TestEncodeB64.java (100%) delete mode 100644 ebean-test/src/test/java/io/ebean/PropertyTest.java rename ebean-test/src/test/java/io/ebean/{server/type => xtest}/MyDayOfWeek.java (92%) rename ebean-test/src/test/java/io/ebean/{server/type => xtest}/MyEnum.java (93%) rename ebean-test/src/test/java/io/ebean/{server/type => xtest}/MySex.java (55%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/ColumnTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/DtoQuery2Test.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/DtoQueryFromOrmTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/DtoQueryTest.java (99%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServerFactory_MultiTenancy_Test.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServerFactory_ServerConfigStart_Test.java (95%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_deleteAllByIdTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_deleteByIdTest.java (94%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_deleteTest.java (85%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_eqlTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_refresh.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/EbeanServer_saveAllTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/ExtendedServerTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/FetchConfigTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/FetchGroupTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/MyCurrentUserProvider.java (95%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/PlatformCondition.java (96%) create mode 100644 ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/SqlRowBooleanTest.java (86%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/StringHelperTest.java (99%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TestDirtyProperties.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TestFilterWithEnum.java (85%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TestUnsetLoadedProperties.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TextExpressionListTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TransactionalTestCase.java (89%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/TxScopeTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest/base}/UpdateQueryTest.java (99%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/bean/EntityBeanInterceptTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/cache/CacheKeyTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/cache/ServerCacheManagerTest.java (93%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/cache/ServerCacheOptionsTest.java (90%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/common/BeanListTest.java (99%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/common/BeanMapTest.java (99%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/common/BeanSetTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/ContainerConfigTest.java (92%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/DatabaseConfigTest.java (94%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/DbConstraintNamingTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/DbMigrationConfigTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/DocStoreConfigTest.java (95%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/MatchingNamingConventionTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/PlatformNoGeneratedKeysTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/PropertiesWrapperTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/ServerConfigSqlServerTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/TestTableName.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/BasicSqlLimitOffsetTest.java (89%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/BasicSqlStandardLimiterTest.java (90%) create mode 100644 ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/DbIdentityTest.java (93%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/DbPlatformTypeMappingTest.java (76%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/DbTypeMapTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/HanaHistorySupportTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/HanaPlatformTest.java (91%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/MySqlHistorySupportTest.java (95%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/PostgresHistorySupportTest.java (95%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/SequenceBatchIdGeneratorTest.java (66%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/SqlserverPlatformTest.java (92%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java (67%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java (92%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/event/BeanFindControllerTest.java (98%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/event/BeanPersistControllerTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/event/BeanPostLoadTest.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/event/readaudit/ReadAuditQueryPlanTest.java (89%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/json/EJsonTests.java (99%) rename ebean-test/src/test/java/io/ebean/{text => xtest}/json/JsonBeanReaderTest.java (94%) rename ebean-test/src/test/java/io/ebean/{text => xtest}/json/JsonContextTest.java (97%) rename ebean-test/src/test/java/io/ebean/{text => xtest}/json/JsonWriteOptionsTests.java (96%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/plugin/BeanTypeTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/plugin/ExpressionPathTest.java (97%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/plugin/PropertyTest.java (93%) rename ebean-test/src/test/java/io/ebean/{ => xtest}/plugin/SpiServerTest.java (94%) create mode 100644 ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java diff --git a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java b/ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java similarity index 81% rename from ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java rename to ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java index 042fb1b58..4de1c2162 100644 --- a/ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java +++ b/ebean-api/src/test/java/io/ebean/text/PathPropertiesTests.java @@ -1,24 +1,12 @@ package io.ebean.text; -import io.ebean.BaseTestCase; -import io.ebean.DB; import io.ebean.FetchPath; -import io.ebean.Query; -import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.tests.model.basic.Customer; -import org.tests.model.basic.ResetBasicData; - -import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -public class PathPropertiesTests extends BaseTestCase { - - private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class); +public class PathPropertiesTests { @Test public void test_noParentheses() { @@ -196,34 +184,4 @@ public class PathPropertiesTests extends BaseTestCase { assertFalse(root.includesPath("customer", "shippingAddress")); } - @Test - public void example_withQueryAndJson() { - - ResetBasicData.reset(); - - PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))"); - - Query query = DB.find(Customer.class) - .where().lt("id", 2) - .query(); - - pathProps.apply(query); - - List list = query.findList(); - - String asJson = DB.json().toJson(list, pathProps); - log.info("Json: {}", asJson); - } - - @Test - public void test_withAllPropsQuery() { - PathProperties root = PathProperties.parse("*,billingAddress(line1)"); - LoggedSql.start(); - Query query = DB.find(Customer.class).apply(root); - query.findList(); - List sql = LoggedSql.stop(); - assertThat(sql).hasSize(1); - assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;"); - } - } diff --git a/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java rename to ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java index b117d47ae..2d240eabc 100644 --- a/ebean-test/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java +++ b/ebean-core/src/test/java/io/ebean/config/UnderscoreNamingConventionTest.java @@ -1,5 +1,6 @@ package io.ebean.config; +import io.ebean.config.UnderscoreNamingConvention; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java similarity index 72% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java index 5569064ba..4be838b39 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DatabasePlatformTest.java @@ -1,8 +1,5 @@ package io.ebean.config.dbplatform; -import io.ebean.BaseTestCase; -import io.ebean.DB; -import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.MatchingNamingConvention; @@ -12,45 +9,9 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -public class DatabasePlatformTest extends BaseTestCase { - - @Test - @ForPlatform(Platform.H2) - public void h2_platform() { - final Platform platform = DB.getDefault().platform(); - assertThat(platform).isSameAs(Platform.H2); - } - - @Test - @ForPlatform(Platform.POSTGRES) - public void postgres_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.POSTGRES); - } - - @Test - @ForPlatform(Platform.MYSQL) - public void mysql_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.MYSQL); - } - - @Test - @ForPlatform(Platform.MARIADB) - public void mariadb_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.MARIADB); - } - - @Test - @ForPlatform(Platform.SQLSERVER) - public void sqlserver_platform() { - final Platform platform = DB.getDefault().platform().base(); - assertThat(platform).isSameAs(Platform.SQLSERVER); - } +class DatabasePlatformTest { @Test public void convertQuotedIdentifiers_when_allQuotedIdentifier_sqlServer() { diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java similarity index 87% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java index f53b5baf0..012c7321e 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeLookupTest.java @@ -1,5 +1,9 @@ package io.ebean.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformTypeLookup; +import io.ebean.config.dbplatform.DbType; +import io.ebean.config.dbplatform.ExtraDbTypes; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.sql.Types; @@ -13,7 +17,7 @@ public class DbPlatformTypeLookupTest { @Test public void byName() throws Exception { - assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL); + Assertions.assertEquals(lookup.byName("DECIMAL"), DbType.DECIMAL); assertEquals(lookup.byName("Decimal"), DbType.DECIMAL); assertEquals(lookup.byName("decimal"), DbType.DECIMAL); diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java index 44f85c2ac..4bbc46ef1 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeParserTest.java @@ -1,5 +1,7 @@ package io.ebean.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeParser; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java index 450749f96..fe0c2f296 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/MySqlPlatformTest.java @@ -1,6 +1,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java index 47d8fa0dd..72f44aa5d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/OraclePlatformTest.java @@ -1,6 +1,7 @@ package io.ebean.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.oracle.Oracle11Platform; import io.ebean.config.dbplatform.oracle.Oracle12Platform; import io.ebean.config.dbplatform.oracle.OraclePlatform; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java rename to ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java index b7b6d524f..5ab6a479d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java +++ b/ebean-core/src/test/java/io/ebean/config/dbplatform/PostgresPlatformTest.java @@ -2,6 +2,8 @@ package io.ebean.config.dbplatform; import io.ebean.Query; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.postgres.PostgresPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java b/ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java similarity index 100% rename from ebean-test/src/test/java/io/ebean/util/CamelCaseHelperTest.java rename to ebean-core/src/test/java/io/ebean/util/CamelCaseHelperTest.java diff --git a/ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java b/ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java similarity index 100% rename from ebean-test/src/test/java/io/ebean/util/TestEncodeB64.java rename to ebean-core/src/test/java/io/ebean/util/TestEncodeB64.java diff --git a/ebean-test/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/BaseTestCase.java index 43ba79427..139e49e26 100644 --- a/ebean-test/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-test/src/test/java/io/ebean/BaseTestCase.java @@ -7,6 +7,7 @@ import io.ebean.config.dbplatform.IdType; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.util.StringHelper; +import io.ebean.xtest.base.PlatformCondition; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/io/ebean/PropertyTest.java b/ebean-test/src/test/java/io/ebean/PropertyTest.java deleted file mode 100644 index 128103dfb..000000000 --- a/ebean-test/src/test/java/io/ebean/PropertyTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.ebean; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; - -public class PropertyTest { - - @Test - public void equals() throws Exception { - - assertEquals(prop("foo", true), prop("foo", true)); - } - - @Test - public void diff_basic() throws Exception { - - assertNotEquals(prop("foo", true), prop("bar", true)); - assertNotEquals(prop("foo", true), prop("foo", false)); - assertNotEquals(prop("foo", false), prop("foo", true)); - } - - @Test - public void diff_nulls() throws Exception { - - assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high")); - assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low")); - - assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high")); - assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true)); - assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low")); - assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high")); - } - - private OrderBy.Property prop(String name, boolean asc) { - return new OrderBy.Property(name, asc, null, null); - } - - private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) { - return new OrderBy.Property(name, asc, nulls, highLow); - } - -} diff --git a/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java b/ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java rename to ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java index 6b5697733..175f53bbb 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MyDayOfWeek.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MyDayOfWeek.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; import io.ebean.annotation.EnumValue; diff --git a/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java b/ebean-test/src/test/java/io/ebean/xtest/MyEnum.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/server/type/MyEnum.java rename to ebean-test/src/test/java/io/ebean/xtest/MyEnum.java index d72a853db..a94e6e9b0 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MyEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MyEnum.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; import io.ebean.annotation.EnumValue; diff --git a/ebean-test/src/test/java/io/ebean/server/type/MySex.java b/ebean-test/src/test/java/io/ebean/xtest/MySex.java similarity index 55% rename from ebean-test/src/test/java/io/ebean/server/type/MySex.java rename to ebean-test/src/test/java/io/ebean/xtest/MySex.java index b66ca2e82..edc9de792 100644 --- a/ebean-test/src/test/java/io/ebean/server/type/MySex.java +++ b/ebean-test/src/test/java/io/ebean/xtest/MySex.java @@ -1,4 +1,4 @@ -package io.ebean.server.type; +package io.ebean.xtest; public enum MySex { MALE, FEMALE diff --git a/ebean-test/src/test/java/io/ebean/ColumnTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/ColumnTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java index 041e64efa..1e7ac92b9 100644 --- a/ebean-test/src/test/java/io/ebean/ColumnTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ColumnTest.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebeaninternal.server.rawsql.SpiRawSql; diff --git a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/DtoQuery2Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java index 90a62f734..36f667956 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DtoQuery; +import io.ebean.QueryIterator; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index f850e3e0b..a54f4dd24 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.DtoQuery; +import io.ebean.ProfileLocation; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; diff --git a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/DtoQueryTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java index f41928909..26b32bd05 100644 --- a/ebean-test/src/test/java/io/ebean/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.DtoQuery; +import io.ebean.SqlRow; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java index 00f395f36..c263240f0 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.Database; +import io.ebean.DatabaseFactory; import io.ebean.config.*; import io.ebean.config.dbplatform.mysql.MySqlPlatform; import io.ebean.config.dbplatform.postgres.PostgresPlatform; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java index 3946de7dd..e48034d9c 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServerFactory_ServerConfigStart_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_ServerConfigStart_Test.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.Database; +import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.event.ServerConfigStartup; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java index 455871ae6..54d9fd45b 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java index d86dc382d..5bc087199 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java index 10ed5fbb9..39c9e2469 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; @@ -9,7 +13,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -public class EbeanServer_deleteTest extends BaseTestCase { +public class EbeanServer_deleteTest extends BaseTestCase { @Test public void delete() { diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index 6e538d0ec..6c5927d21 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Query; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java index 2d1e957e7..dc0ffcd32 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_refresh.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_refresh.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; +import io.ebean.Database; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java index 474576b0c..f0aa638b7 100644 --- a/ebean-test/src/test/java/io/ebean/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/ExtendedServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java index 9be28fa76..e285b3849 100644 --- a/ebean-test/src/test/java/io/ebean/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/FetchConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/FetchConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java index 5c644b231..122c1b122 100644 --- a/ebean-test/src/test/java/io/ebean/FetchConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.FetchConfig; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/FetchGroupTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java index 74744391e..76925f4e3 100644 --- a/ebean-test/src/test/java/io/ebean/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.FetchGroup; +import io.ebean.Query; import io.ebean.service.SpiFetchGroupQuery; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java b/ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java rename to ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java index 3f2c316a0..d31c65a51 100644 --- a/ebean-test/src/test/java/io/ebean/MyCurrentUserProvider.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/MyCurrentUserProvider.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebean.config.CurrentUserProvider; diff --git a/ebean-test/src/test/java/io/ebean/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/PlatformCondition.java rename to ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java index af8ce62d1..eada8ae2d 100644 --- a/ebean-test/src/test/java/io/ebean/PlatformCondition.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java new file mode 100644 index 000000000..6379be4ff --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PropertyTest.java @@ -0,0 +1,46 @@ +package io.ebean.xtest.base; + +import io.ebean.OrderBy; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +public class PropertyTest { + + @Test + public void equals() throws Exception { + + Assertions.assertEquals(prop("foo", true), prop("foo", true)); + } + + @Test + public void diff_basic() throws Exception { + + Assertions.assertNotEquals(prop("foo", true), prop("bar", true)); + Assertions.assertNotEquals(prop("foo", true), prop("foo", false)); + Assertions.assertNotEquals(prop("foo", false), prop("foo", true)); + } + + @Test + public void diff_nulls() throws Exception { + + Assertions.assertEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "high")); + Assertions.assertEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "low")); + + Assertions.assertNotEquals(prop("foo", true), prop("foo", true, "nulls", "high")); + Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true)); + Assertions.assertNotEquals(prop("foo", true, "nulls", "high"), prop("foo", true, "nulls", "low")); + Assertions.assertNotEquals(prop("foo", true, "nulls", "low"), prop("foo", true, "nulls", "high")); + } + + private OrderBy.Property prop(String name, boolean asc) { + return new OrderBy.Property(name, asc, null, null); + } + + private OrderBy.Property prop(String name, boolean asc, String nulls, String highLow) { + return new OrderBy.Property(name, asc, nulls, highLow); + } + +} diff --git a/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java similarity index 86% rename from ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java index 0c0b51522..bac0f7aaf 100644 --- a/ebean-test/src/test/java/io/ebean/SqlRowBooleanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java @@ -1,5 +1,9 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.SqlQuery; +import io.ebean.SqlRow; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/StringHelperTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/StringHelperTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java index 5beeeb905..de03cbdcf 100644 --- a/ebean-test/src/test/java/io/ebean/StringHelperTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/StringHelperTest.java @@ -1,4 +1,4 @@ -package io.ebean; +package io.ebean.xtest.base; import io.ebean.util.StringHelper; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/TestDirtyProperties.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java index 3f2b0e581..1a3892a46 100644 --- a/ebean-test/src/test/java/io/ebean/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.ValuePair; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebeaninternal.server.core.DefaultBeanState; diff --git a/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java index dfe3b8932..756dfdfa8 100644 --- a/ebean-test/src/test/java/io/ebean/TestFilterWithEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Filter; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java index 38d6cc22a..4f1f01e60 100644 --- a/ebean-test/src/test/java/io/ebean/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java @@ -1,5 +1,8 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.BeanState; +import io.ebean.DB; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/TextExpressionListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java index e6c85b6f1..d409628d6 100644 --- a/ebean-test/src/test/java/io/ebean/TextExpressionListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TextExpressionListTest.java @@ -1,6 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.DB; import io.ebean.search.Match; import io.ebean.search.MultiMatch; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/TransactionalTestCase.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java index 4975100fa..13be5bbc7 100644 --- a/ebean-test/src/test/java/io/ebean/TransactionalTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java @@ -1,5 +1,7 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.BaseTestCase; +import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/io/ebean/TxScopeTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/TxScopeTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java index 6d6cb5ce9..3d94f83dd 100644 --- a/ebean-test/src/test/java/io/ebean/TxScopeTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TxScopeTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.TxScope; import io.ebean.annotation.PersistBatch; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/UpdateQueryTest.java rename to ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java index ec8e55c30..62ee44b5b 100644 --- a/ebean-test/src/test/java/io/ebean/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest.base; +import io.ebean.*; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.IgnorePlatform; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java rename to ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java index e233bc562..e4a22bed4 100644 --- a/ebean-test/src/test/java/io/ebean/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java @@ -1,7 +1,9 @@ -package io.ebean.bean; +package io.ebean.xtest.bean; import io.ebean.BaseTestCase; import io.ebean.DB; +import io.ebean.bean.EntityBean; +import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.AuditInfo; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java index 4e0b987f9..ca0d2bd8f 100644 --- a/ebean-test/src/test/java/io/ebean/cache/CacheKeyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/CacheKeyTest.java @@ -1,5 +1,6 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; +import io.ebean.cache.TenantAwareKey; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java index 9145f46ab..9e3b9272e 100644 --- a/ebean-test/src/test/java/io/ebean/cache/ServerCacheManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheManagerTest.java @@ -1,6 +1,8 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; import io.ebean.DB; +import io.ebean.cache.ServerCacheManager; +import io.ebean.cache.ServerCacheRegion; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java rename to ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java index 4601a321d..e3ee204e6 100644 --- a/ebean-test/src/test/java/io/ebean/cache/ServerCacheOptionsTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/cache/ServerCacheOptionsTest.java @@ -1,5 +1,6 @@ -package io.ebean.cache; +package io.ebean.xtest.cache; +import io.ebean.cache.ServerCacheOptions; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanListTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/common/BeanListTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java index fc041549e..b56d6ce95 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanListTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanList; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/common/BeanMapTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java index fc9a481cd..d931ed254 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanMapTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanMapTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanMap; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java b/ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/common/BeanSetTest.java rename to ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java index 7bc12bb07..17937d13b 100644 --- a/ebean-test/src/test/java/io/ebean/common/BeanSetTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/common/BeanSetTest.java @@ -1,6 +1,7 @@ -package io.ebean.common; +package io.ebean.xtest.common; import io.ebean.bean.BeanCollection; +import io.ebean.common.BeanSet; import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; diff --git a/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java index 183360a07..2ae4f24e2 100644 --- a/ebean-test/src/test/java/io/ebean/config/ContainerConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ContainerConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.ContainerConfig; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java index 7ef7cc0f7..3568595b0 100644 --- a/ebean-test/src/test/java/io/ebean/config/DatabaseConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java @@ -1,10 +1,15 @@ -package io.ebean.config; +package io.ebean.xtest.config; import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.annotation.MutationDetection; import io.ebean.annotation.PersistBatch; +import io.ebean.config.DatabaseConfig; +import io.ebean.config.JsonConfig; +import io.ebean.config.MatchingNamingConvention; +import io.ebean.config.PlatformConfig; import io.ebean.config.dbplatform.IdType; import io.ebean.datasource.DataSourceConfig; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.Properties; @@ -105,8 +110,8 @@ public class DatabaseConfigTest { assertEquals(IdType.SEQUENCE, config.getIdType()); assertEquals(PersistBatch.ALL, config.getPersistBatch()); assertEquals(PersistBatch.ALL, config.getPersistBatchOnCascade()); - assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid()); - assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime()); + Assertions.assertEquals(PlatformConfig.DbUuid.BINARY, config.getPlatformConfig().getDbUuid()); + Assertions.assertEquals(JsonConfig.DateTime.MILLIS, config.getJsonDateTime()); assertEquals(JsonConfig.Date.MILLIS, config.getJsonDate()); assertEquals("r0,users,orgs", config.getEnabledL2Regions()); diff --git a/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java index 842395369..b08777c04 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbConstraintNamingTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DbConstraintNamingTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.DbConstraintNaming; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java index 03465543b..dfbdb2291 100644 --- a/ebean-test/src/test/java/io/ebean/config/DbMigrationConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DbMigrationConfigTest.java @@ -1,5 +1,6 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.DatabaseConfig; import io.ebean.migration.MigrationConfig; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java index a497e0d92..c567b7931 100644 --- a/ebean-test/src/test/java/io/ebean/config/DocStoreConfigTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/DocStoreConfigTest.java @@ -1,6 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.annotation.DocStoreMode; +import io.ebean.config.DocStoreConfig; +import io.ebean.config.PropertiesWrapper; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java index d832f1370..4e0bb89d4 100644 --- a/ebean-test/src/test/java/io/ebean/config/MatchingNamingConventionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/MatchingNamingConventionTest.java @@ -1,5 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; +import io.ebean.config.MatchingNamingConvention; +import io.ebean.config.PlatformConfig; +import io.ebean.config.TableName; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java index 37d02bbb8..1fa24400b 100644 --- a/ebean-test/src/test/java/io/ebean/config/PlatformNoGeneratedKeysTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/PlatformNoGeneratedKeysTest.java @@ -1,9 +1,10 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.Transaction; import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DbIdentity; import io.ebean.config.dbplatform.IdType; import io.ebean.config.dbplatform.h2.H2Platform; diff --git a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java index 5301d0173..fdb6dbddc 100644 --- a/ebean-test/src/test/java/io/ebean/config/PropertiesWrapperTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/PropertiesWrapperTest.java @@ -1,7 +1,8 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.avaje.config.Config; import io.ebean.annotation.Platform; +import io.ebean.config.PropertiesWrapper; import org.junit.jupiter.api.Test; import java.util.Properties; diff --git a/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index 4f3449df4..bdeb926e8 100644 --- a/ebean-test/src/test/java/io/ebean/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -1,10 +1,11 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/TestTableName.java rename to ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java index ccf73ce03..699bd5566 100644 --- a/ebean-test/src/test/java/io/ebean/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java @@ -1,6 +1,7 @@ -package io.ebean.config; +package io.ebean.xtest.config; import io.ebean.BaseTestCase; +import io.ebean.config.TableName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java index f10469d52..018f2097f 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlLimitOffsetTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlLimitOffsetTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.BasicSqlLimitOffset; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java similarity index 90% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java index 3e8da3acc..d54f380d7 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/BasicSqlStandardLimiterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/BasicSqlStandardLimiterTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.BasicSqlAnsiLimiter; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java new file mode 100644 index 000000000..35ad4aa4f --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java @@ -0,0 +1,49 @@ +package io.ebean.xtest.config.dbplatform; + +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; + +class DatabasePlatformBaseTest extends BaseTestCase { + + @Test + @ForPlatform(Platform.H2) + public void h2_platform() { + final Platform platform = DB.getDefault().platform(); + assertThat(platform).isSameAs(Platform.H2); + } + + @Test + @ForPlatform(Platform.POSTGRES) + public void postgres_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.POSTGRES); + } + + @Test + @ForPlatform(Platform.MYSQL) + public void mysql_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.MYSQL); + } + + @Test + @ForPlatform(Platform.MARIADB) + public void mariadb_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.MARIADB); + } + + @Test + @ForPlatform(Platform.SQLSERVER) + public void sqlserver_platform() { + final Platform platform = DB.getDefault().platform().base(); + assertThat(platform).isSameAs(Platform.SQLSERVER); + } + +} diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java index 52b23173a..d23add071 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbIdentityTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbIdentityTest.java @@ -1,5 +1,6 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbIdentity; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java similarity index 76% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java index 27fbaf159..a20ecbca9 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbPlatformTypeMappingTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbPlatformTypeMappingTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; import org.junit.jupiter.api.Test; import java.sql.Types; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java index 2053e98f6..eb59e5e2e 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/DbTypeMapTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DbTypeMapTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.DbPlatformType; +import io.ebean.config.dbplatform.DbPlatformTypeMapping; import io.ebean.config.dbplatform.clickhouse.ClickHousePlatform; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.config.dbplatform.mysql.MySqlPlatform; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java index cec87e885..880f7f216 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.hana.HanaHistorySupport; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java similarity index 91% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java index 94ff431c7..5c56b7fb8 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/HanaPlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/HanaPlatformTest.java @@ -1,6 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.hana.HanaPlatform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java index 9993f5450..d3a36ba0d 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/MySqlHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/MySqlHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.mysql.MySqlHistorySupport; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java similarity index 95% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java index 6dcb81431..3e473b80f 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/PostgresHistorySupportTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/PostgresHistorySupportTest.java @@ -1,4 +1,4 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.dbplatform.postgres.PostgresHistorySupport; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java similarity index 66% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java index 295096e75..47f4f9552 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/SequenceBatchIdGeneratorTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SequenceBatchIdGeneratorTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; +import io.ebean.config.dbplatform.SequenceIdGenerator; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.sql.ResultSet; @@ -20,12 +22,12 @@ public class SequenceBatchIdGeneratorTest { generator.add(asList(5L, 6L)); generator.add(asList(3L, 4L)); - assertThat(generator.nextId(null)).isEqualTo(1L); - assertThat(generator.nextId(null)).isEqualTo(2L); - assertThat(generator.nextId(null)).isEqualTo(3L); - assertThat(generator.nextId(null)).isEqualTo(4L); - assertThat(generator.nextId(null)).isEqualTo(5L); - assertThat(generator.nextId(null)).isEqualTo(6L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(1L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(2L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(3L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(4L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(5L); + Assertions.assertThat(generator.nextId(null)).isEqualTo(6L); } private class TD extends SequenceIdGenerator { diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java index 887b19a3d..c2459470a 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/SqlserverPlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/SqlserverPlatformTest.java @@ -1,6 +1,7 @@ -package io.ebean.config.dbplatform; +package io.ebean.xtest.config.dbplatform; import io.ebean.config.PlatformConfig; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java similarity index 67% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java index 9740f6858..82fbda0bf 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServer2016PlatformTest.java @@ -1,5 +1,7 @@ -package io.ebean.config.dbplatform.sqlserver; +package io.ebean.xtest.config.dbplatform.sqlserver; +import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform; +import io.ebean.config.dbplatform.sqlserver.SqlServerHistorySupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java similarity index 92% rename from ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java rename to ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index 1ca441253..eefbd9138 100644 --- a/ebean-test/src/test/java/io/ebean/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -1,9 +1,10 @@ -package io.ebean.config.dbplatform.sqlserver; +package io.ebean.xtest.config.dbplatform.sqlserver; import io.ebean.BackgroundExecutor; import io.ebean.BaseTestCase; import io.ebean.annotation.ForPlatform; import io.ebean.annotation.Platform; +import io.ebean.config.dbplatform.sqlserver.SqlServerStepSequence; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java similarity index 98% rename from ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java index f95f5ed91..8869c6f69 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java @@ -1,4 +1,4 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.BaseTestCase; import io.ebean.Database; @@ -6,6 +6,8 @@ import io.ebean.DatabaseFactory; import io.ebean.bean.BeanCollection; import io.ebean.common.BeanList; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanFindController; +import io.ebean.event.BeanQueryRequest; import org.junit.jupiter.api.Test; import org.tests.example.ModUuidGenerator; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java index e42088df2..e584bc40b 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPersistControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPersistControllerTest.java @@ -1,10 +1,13 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.Transaction; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanDeleteIdRequest; +import io.ebean.event.BeanPersistAdapter; +import io.ebean.event.BeanPersistRequest; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTDetail; diff --git a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java index 87cab8635..b463129cd 100644 --- a/ebean-test/src/test/java/io/ebean/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java @@ -1,8 +1,9 @@ -package io.ebean.event; +package io.ebean.xtest.event; import io.ebean.*; import io.ebean.config.DatabaseConfig; +import io.ebean.event.BeanPostLoad; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java similarity index 89% rename from ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java rename to ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java index d29d4a432..50f7f8ace 100644 --- a/ebean-test/src/test/java/io/ebean/event/readaudit/ReadAuditQueryPlanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/readaudit/ReadAuditQueryPlanTest.java @@ -1,6 +1,7 @@ -package io.ebean.event.readaudit; +package io.ebean.xtest.event.readaudit; +import io.ebean.event.readaudit.ReadAuditQueryPlan; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java b/ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/json/EJsonTests.java rename to ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java index 1063e4d36..7e721333f 100644 --- a/ebean-test/src/test/java/io/ebean/json/EJsonTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/EJsonTests.java @@ -1,4 +1,4 @@ -package io.ebean.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java index a60b18d3f..3da9db351 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java @@ -1,9 +1,12 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonParser; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; +import io.ebean.text.json.JsonBeanReader; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java index bb1b4056d..ba9606b16 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonContextTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonContextTest.java @@ -1,8 +1,11 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonGenerator; import io.ebean.DB; import io.ebean.text.PathProperties; +import io.ebean.text.json.JsonContext; +import io.ebean.text.json.JsonReadBeanVisitor; +import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java similarity index 96% rename from ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java rename to ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java index 4076d82a9..c3dd5ded2 100644 --- a/ebean-test/src/test/java/io/ebean/text/json/JsonWriteOptionsTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonWriteOptionsTests.java @@ -1,6 +1,7 @@ -package io.ebean.text.json; +package io.ebean.xtest.json; import io.ebean.FetchPath; +import io.ebean.text.json.JsonWriteOptions; import org.junit.jupiter.api.Test; import java.util.Set; diff --git a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java index cb6e4a9d2..b5a136a2a 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/BeanTypeTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/BeanTypeTest.java @@ -1,9 +1,12 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; import io.ebean.FetchPath; import io.ebean.Query; +import io.ebean.plugin.BeanDocType; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; import io.ebean.text.PathProperties; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.querydefn.OrmQueryDetail; diff --git a/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java similarity index 97% rename from ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java index 4bf5d1f0e..de9c14829 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/ExpressionPathTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/ExpressionPathTest.java @@ -1,7 +1,9 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.ExpressionPath; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java similarity index 93% rename from ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java index d20757d55..6730bfdab 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/PropertyTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/PropertyTest.java @@ -1,7 +1,9 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.Property; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java similarity index 94% rename from ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java rename to ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java index 2189aaa44..cc3bec462 100644 --- a/ebean-test/src/test/java/io/ebean/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java @@ -1,8 +1,10 @@ -package io.ebean.plugin; +package io.ebean.xtest.plugin; import io.ebean.BaseTestCase; import io.ebean.DB; import io.ebean.Database; +import io.ebean.plugin.BeanType; +import io.ebean.plugin.SpiServer; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.VwCustomer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java new file mode 100644 index 000000000..620e9ab20 --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java @@ -0,0 +1,51 @@ +package io.ebean.xtest.text; + +import io.ebean.BaseTestCase; +import io.ebean.DB; +import io.ebean.Query; +import io.ebean.test.LoggedSql; +import io.ebean.text.PathProperties; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.tests.model.basic.Customer; +import org.tests.model.basic.ResetBasicData; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +class PathPropertiesTests extends BaseTestCase { + + private static final Logger log = LoggerFactory.getLogger(PathPropertiesTests.class); + + @Test + void example_withQueryAndJson() { + ResetBasicData.reset(); + + PathProperties pathProps = PathProperties.parse("id,name,billingAddress(city),shippingAddress(*))"); + + Query query = DB.find(Customer.class) + .where().lt("id", 2) + .query(); + + pathProps.apply(query); + + List list = query.findList(); + + String asJson = DB.json().toJson(list, pathProps); + log.info("Json: {}", asJson); + } + + @Test + void test_withAllPropsQuery() { + PathProperties root = PathProperties.parse("*,billingAddress(line1)"); + LoggedSql.start(); + Query query = DB.find(Customer.class).apply(root); + query.findList(); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;"); + } + +} diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index d46c0afef..61f9bfb69 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -5,9 +5,9 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; -import io.ebean.server.type.MyDayOfWeek; -import io.ebean.server.type.MyEnum; -import io.ebean.server.type.MySex; +import io.ebean.xtest.MyDayOfWeek; +import io.ebean.xtest.MyEnum; +import io.ebean.xtest.MySex; import io.ebeaninternal.server.core.bootup.BootupClasses; import org.junit.jupiter.api.Test; import org.tests.model.ivo.Money; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index ef0717cdb..30f2239de 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -1,7 +1,7 @@ package org.tests.basic; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java index a552f0a92..6c99dd1a1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderByAnnotation.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java index f0989b7ac..948aaec30 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestWhereAnnotation.java @@ -2,7 +2,7 @@ package org.tests.basic; import io.ebean.DB; import io.ebean.Query; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java index 01da50bbe..c3444cc00 100644 --- a/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java +++ b/ebean-test/src/test/java/org/tests/basic/join/TestSecondaryJoin.java @@ -1,7 +1,7 @@ package org.tests.basic.join; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.Order.Status; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java index 5dbfa8b6a..15866f137 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestInetAddressType.java @@ -1,7 +1,7 @@ package org.tests.basic.type; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.types.Cidr; import io.ebean.types.Inet; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 65b7b8005..7c100ec0b 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -8,6 +8,7 @@ import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.test.LoggedSql; +import io.ebean.xtest.base.DtoQuery2Test; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java index d819dbe2f..d01024e27 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadEmptyCollection.java @@ -1,7 +1,7 @@ package org.tests.batchload; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java index ffa0a5608..460f975cb 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondaryQueries.java @@ -3,7 +3,7 @@ package org.tests.batchload; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index 00c3b03cb..53ba7cb1b 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -2,7 +2,7 @@ package org.tests.generated; import io.ebean.BaseTestCase; import io.ebean.DB; -import io.ebean.MyCurrentUserProvider; +import io.ebean.xtest.base.MyCurrentUserProvider; import org.junit.jupiter.api.Test; import org.tests.model.EWhoProps; import org.tests.model.generated.User; diff --git a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java index e6604035d..a6e198735 100644 --- a/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/order/TestOrderColumn.java @@ -1,7 +1,7 @@ package org.tests.order; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java index 4680763cf..0e7d1b334 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindWhereUsingEnumerated.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonEnum; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java index b52522de9..851e1c9fa 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestLikeEscaping.java @@ -1,7 +1,7 @@ package org.tests.query.other; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java index 01cc7a627..7b9a2fe10 100644 --- a/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java +++ b/ebean-test/src/test/java/org/tests/query/softdelete/TestSoftDeletePagingList.java @@ -2,7 +2,7 @@ package org.tests.query.softdelete; import io.ebean.DB; import io.ebean.PagedList; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.album.Cover; diff --git a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java index 078839f6a..2fcc07d09 100644 --- a/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java +++ b/ebean-test/src/test/java/org/tests/refresh/TestRefreshWithMany.java @@ -2,7 +2,7 @@ package org.tests.refresh; import io.ebean.DB; import io.ebean.SqlRow; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java index fc02c2133..7306753f0 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -1,7 +1,7 @@ package org.tests.text.csv; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.util.IOUtils; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index af2ccd4a3..cf55d67b1 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -1,7 +1,7 @@ package org.tests.text.csv; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.csv.CsvReader; import io.ebean.text.csv.DefaultCsvCallback; import io.ebean.util.IOUtils; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java index d8d2912d7..b990a09a5 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java @@ -2,7 +2,7 @@ package org.tests.text.json; import io.ebean.DB; import io.ebean.Database; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index d03da5ffb..36dab37d0 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -1,7 +1,7 @@ package org.tests.update; import io.ebean.DB; -import io.ebean.TransactionalTestCase; +import io.ebean.xtest.base.TransactionalTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties index dd5d255ff..d1b3f87e3 100644 --- a/ebean-test/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -39,7 +39,7 @@ ebean.autoReadOnlyDataSource=true #ebean.h2.idType=SEQUENCE ebean.mappingLocations=classpath:/ebean-xml-mappings -ebean.currentUserProvider=io.ebean.MyCurrentUserProvider +ebean.currentUserProvider=io.ebean.xtest.base.MyCurrentUserProvider #ebean.expressionNativeIlike=true #ebean.jsonInclude=NON_NULL From 84a64f9640f2c698d05bdf10ecc94e86394e8230 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 24 Mar 2022 18:52:37 +1300 Subject: [PATCH 17/17] Refactor tests, move BaseTestCase and annotations @ForPlatform @IgnorePlatform --- ebean-test/src/test/java/io/ebean/DbPrimaryTest.java | 3 ++- .../src/test/java/io/ebean/test/DbJsonTest.java | 2 +- .../test/java/io/ebean/{ => xtest}/BaseTestCase.java | 3 ++- .../io/ebean/{annotation => xtest}/ForPlatform.java | 4 +++- .../ebean/{annotation => xtest}/IgnorePlatform.java | 4 +++- .../test/java/io/ebean/xtest/base/DtoQuery2Test.java | 2 +- .../io/ebean/xtest/base/DtoQueryFromOrmTest.java | 4 ++-- .../test/java/io/ebean/xtest/base/DtoQueryTest.java | 4 ++-- .../base/EbeanServerFactory_MultiTenancy_Test.java | 2 +- .../xtest/base/EbeanServer_deleteAllByIdTest.java | 2 +- .../ebean/xtest/base/EbeanServer_deleteByIdTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_deleteTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_eqlTest.java | 2 +- .../io/ebean/xtest/base/EbeanServer_saveAllTest.java | 2 +- .../java/io/ebean/xtest/base/ExtendedServerTest.java | 1 + .../java/io/ebean/xtest/base/FetchGroupTest.java | 2 +- .../java/io/ebean/xtest/base/PlatformCondition.java | 4 ++-- .../java/io/ebean/xtest/base/SqlRowBooleanTest.java | 2 +- .../io/ebean/xtest/base/TestDirtyProperties.java | 2 +- .../java/io/ebean/xtest/base/TestFilterWithEnum.java | 2 +- .../ebean/xtest/base/TestUnsetLoadedProperties.java | 4 ++-- .../io/ebean/xtest/base/TransactionalTestCase.java | 2 +- .../java/io/ebean/xtest/base/UpdateQueryTest.java | 5 +++-- .../io/ebean/xtest/bean/EntityBeanInterceptTest.java | 2 +- .../xtest/config/ServerConfigSqlServerTest.java | 2 +- .../java/io/ebean/xtest/config/TestTableName.java | 2 +- .../config/dbplatform/DatabasePlatformBaseTest.java | 4 ++-- .../sqlserver/SqlServerStepSequenceTest.java | 4 ++-- .../xtest/docstore/DocStoreBeanBaseAdapterTest.java | 2 +- .../io/ebean/xtest/event/BeanFindControllerTest.java | 2 +- .../java/io/ebean/xtest/event/BeanPostLoadTest.java | 1 + .../BinaryTransactionEventReadWriteTest.java | 2 +- .../executor/TestShutdownWithBackgroundTasks.java | 2 +- .../xtest/internal/server/grammer/EqlParserTest.java | 6 +++--- .../internal/server/lib/ShutdownManagerTest.java | 2 +- .../server/query/LimitOffsetPagedListTest.java | 2 +- .../query/TestFutureRowCountErrorHandling.java | 1 + .../internal/server/rawsql/TestRawSqlBuilder.java | 3 ++- .../internal/server/rawsql/TestRawSqlParsing.java | 3 ++- .../server/text/json/TestJsonWriteVisitor.java | 2 +- .../text/json/TestTextJsonBeanReadVisitor.java | 2 +- .../DefaultTransactionThreadLocalTest.java | 3 ++- .../server/transaction/TransactionManagerTest.java | 2 +- .../internal/server/transaction/TransactionTest.java | 2 +- .../java/io/ebean/xtest/json/JsonBeanReaderTest.java | 2 +- .../java/io/ebean/xtest/plugin/SpiServerTest.java | 2 +- .../io/ebean/xtest/text/PathPropertiesTests.java | 2 +- .../ebeaninternal/dbmigration/DbMigrationTest.java | 3 ++- .../server/cache/CacheBeanDataTest.java | 2 +- .../server/cache/CachedBeanDataFromBeanTest.java | 2 +- .../server/cache/CachedBeanDataSerializeTest.java | 2 +- .../server/changelog/ChangeJsonBuilderTest.java | 2 +- .../changelog/DefaultChangeLogListenerTest.java | 2 +- .../changelog/DefaultChangeLogRegisterTest.java | 2 +- .../DefaultServer_createOrmQueryRequestTest.java | 2 +- .../server/core/DefaultServer_getReferenceTest.java | 2 +- .../server/core/TestDiffHelpSimple.java | 2 +- .../server/core/TestDiffHelpWithEmbedded.java | 2 +- .../server/deploy/BeanDescriptorTest.java | 2 +- .../deploy/BeanDescriptor_documentMappingTest.java | 2 +- .../BeanDescriptor_whenCreatedPropertyTest.java | 2 +- .../server/deploy/BeanPropertyAssocManyTest.java | 2 +- .../server/deploy/DeployPropertyParserTest.java | 4 ++-- .../server/deploy/FormulaPropertyPathTest.java | 2 +- .../deploy/TestBeanDescriptorHasIdProperty.java | 2 +- .../server/deploy/TestCollectionLoadedStatus.java | 2 +- .../server/deploy/TestDiffHelpInsertSimple.java | 2 +- .../deploy/TestDiffHelpInsertWithEmbedded.java | 2 +- .../server/deploy/TestNotEnhancedMappedSuper.java | 2 +- .../TestReferenceWithConstructorProperties.java | 2 +- .../server/expression/BaseExpressionTest.java | 2 +- .../expression/IsEmptyExpressionQueryTest.java | 2 +- .../server/expression/PrepareDocNestedTest.java | 2 +- .../server/loadcontext/DLoadContextTest.java | 2 +- .../server/querydefn/DefaultOrmQueryTest.java | 2 +- .../server/querydefn/OrmQueryDetailTest.java | 2 +- .../io/ebeaninternal/server/type/TestBinaryUUID.java | 2 +- .../server/type/TestSimpleEncryptor.java | 2 +- .../ebeaninternal/server/type/TestTypeManager.java | 2 +- .../test/java/org/etest/ForTestsBeforeAfterTest.java | 4 ++-- ebean-test/src/test/java/org/etest/ForTestsTest.java | 4 ++-- .../partition/MultiTenantPartitionTest.java | 2 +- .../tests/aggregateformula/TestAggregateFormula.java | 4 ++-- .../TestAggregateInheritFormula.java | 2 +- .../java/org/tests/basic/TestAnnotationBase.java | 2 +- .../org/tests/basic/TestAssocOneEqExpression.java | 2 +- .../src/test/java/org/tests/basic/TestBatchLazy.java | 2 +- .../test/java/org/tests/basic/TestBatchLazyMany.java | 2 +- .../org/tests/basic/TestBeanReferenceRefresh.java | 2 +- .../java/org/tests/basic/TestCreateEntityBean.java | 4 ++-- .../tests/basic/TestDeleteCascadingOneToMany.java | 2 +- .../org/tests/basic/TestDeleteImportedPartial.java | 2 +- .../java/org/tests/basic/TestDeleteOneToOne.java | 2 +- .../org/tests/basic/TestDeleteOneToOneMultiple.java | 2 +- .../org/tests/basic/TestDeletePartialNoVersion.java | 2 +- .../test/java/org/tests/basic/TestDynamicUpdate.java | 2 +- .../TestEnhancementCollectionInitialisation.java | 2 +- .../test/java/org/tests/basic/TestErrorBindLog.java | 2 +- .../java/org/tests/basic/TestExplicitInsert.java | 2 +- .../src/test/java/org/tests/basic/TestFetchId.java | 2 +- .../test/java/org/tests/basic/TestIUDVanilla.java | 2 +- .../src/test/java/org/tests/basic/TestInEmpty.java | 2 +- .../test/java/org/tests/basic/TestInheritRef.java | 2 +- .../src/test/java/org/tests/basic/TestJodaType.java | 2 +- .../java/org/tests/basic/TestJoinInheritance.java | 2 +- .../org/tests/basic/TestLazyLoadEmptyOneToMany.java | 2 +- .../java/org/tests/basic/TestLazyLoadInCache.java | 2 +- .../test/java/org/tests/basic/TestLimitQuery.java | 2 +- .../test/java/org/tests/basic/TestLoadBeanCache.java | 2 +- .../java/org/tests/basic/TestLogTransLogOnError.java | 2 +- .../test/java/org/tests/basic/TestM2MCascadeOne.java | 2 +- .../test/java/org/tests/basic/TestM2MVanilla.java | 2 +- .../test/java/org/tests/basic/TestManyLazyLoad.java | 2 +- .../java/org/tests/basic/TestManyOneInterface.java | 2 +- .../test/java/org/tests/basic/TestMappedSuper.java | 2 +- .../java/org/tests/basic/TestMetaAnnotation.java | 4 ++-- .../org/tests/basic/TestMultipleOneToOneIUD.java | 2 +- .../java/org/tests/basic/TestNonUpdateProperty.java | 2 +- .../org/tests/basic/TestOrderTotalAmountFormula.java | 2 +- .../tests/basic/TestOrderTotalAmountReportBean.java | 1 + .../org/tests/basic/TestOrderTotalAmountSql.java | 2 +- .../java/org/tests/basic/TestPersistenceContext.java | 2 +- .../java/org/tests/basic/TestQueryForUpdate.java | 3 ++- .../tests/basic/TestQueryForUpdatePostgresLock.java | 4 ++-- .../org/tests/basic/TestQueryUsingConnection.java | 4 ++-- .../java/org/tests/basic/TestQueryWhereBetween.java | 2 +- .../java/org/tests/basic/TestQueryWhereInRange.java | 2 +- .../java/org/tests/basic/TestQueryWithCache.java | 2 +- .../org/tests/basic/TestReadOnlyPropagation.java | 2 +- .../java/org/tests/basic/TestSaveDeleteOneToOne.java | 2 +- .../tests/basic/TestSaveDeleteOneToOneMultiple.java | 2 +- .../tests/basic/TestSharedInstancePropagation.java | 2 +- .../src/test/java/org/tests/basic/TestTransient.java | 2 +- .../src/test/java/org/tests/basic/TestUpdate.java | 2 +- .../java/org/tests/basic/TestUpdateManyToOne.java | 2 +- .../test/java/org/tests/basic/TestUuidInsert.java | 2 +- .../org/tests/basic/TestUuidInsertMasterDetail.java | 2 +- .../org/tests/basic/delete/TestDeleteByIdList.java | 2 +- .../tests/basic/delete/TestDeleteCascadeById.java | 2 +- .../tests/basic/delete/TestDeleteCascadeByQuery.java | 2 +- .../java/org/tests/basic/encrypt/TestEncrypt.java | 6 +++--- .../org/tests/basic/encrypt/TestEncryptBinary.java | 2 +- .../tests/basic/encrypt/TestEncryptClientSide.java | 2 +- .../tests/basic/event/TestPreInsertValidation.java | 2 +- .../java/org/tests/basic/event/TestQueryAdapter.java | 2 +- .../org/tests/basic/lob/TestBasicClobFetchEager.java | 2 +- .../java/org/tests/basic/lob/TestBasicClobNoVer.java | 2 +- .../test/java/org/tests/basic/lob/TestByteOnly.java | 2 +- .../basic/one2one/TestOne2OneBookingInvoice.java | 2 +- .../tests/basic/one2one/TestOneToOneWheelTire.java | 2 +- .../tests/basic/type/TestEnumValueAnnotation.java | 2 +- .../org/tests/basic/type/TestExtraScalarTypes.java | 2 +- .../tests/basic/type/TestQueryBooleanProperty.java | 2 +- .../java/org/tests/basic/type/TestSqlRowUUID.java | 2 +- .../java/org/tests/basic/type/TestTransientMap.java | 2 +- .../org/tests/batchinsert/TestBatchInsertFlush.java | 3 ++- .../org/tests/batchinsert/TestBatchInsertSimple.java | 4 ++-- .../TestBatchInsertWithInitialisedCollection.java | 2 +- .../TestBatchOnCascadeExceptionHandling.java | 4 ++-- .../batchinsert/TestBatchSaveWithGetBeanId.java | 4 ++-- .../test/java/org/tests/batchload/TestBasicLazy.java | 2 +- .../org/tests/batchload/TestBasicNavOnEmpty.java | 2 +- .../tests/batchload/TestBatchLazyWithCacheHits.java | 2 +- .../tests/batchload/TestBatchLazyWithDeleted.java | 2 +- .../test/java/org/tests/batchload/TestBeanState.java | 2 +- .../org/tests/batchload/TestEmptyManyLazyLoad.java | 2 +- .../test/java/org/tests/batchload/TestLazyJoin.java | 2 +- .../test/java/org/tests/batchload/TestLazyJoin2.java | 2 +- .../tests/batchload/TestLazyLoadNonExistantBean.java | 2 +- .../tests/batchload/TestLazyLoadNonExistentBean.java | 2 +- .../tests/batchload/TestQueryDisableLazyLoad.java | 2 +- .../test/java/org/tests/batchload/TestQueryJoin.java | 2 +- .../org/tests/batchload/TestQueryJoinToAssocOne.java | 2 +- .../org/tests/batchload/TestSecondQueryNoRows.java | 2 +- .../src/test/java/org/tests/cache/TestBeanCache.java | 2 +- .../java/org/tests/cache/TestBeanCacheAsync.java | 2 +- .../tests/cache/TestBeanCacheContactLazyLoad.java | 2 +- .../tests/cache/TestBeanCacheWithDeleteQuery.java | 2 +- .../java/org/tests/cache/TestBeanFetchJoinCache.java | 2 +- .../test/java/org/tests/cache/TestCacheBasic.java | 2 +- .../java/org/tests/cache/TestCacheCollectionIds.java | 1 + .../test/java/org/tests/cache/TestCacheCustomer.java | 2 +- .../test/java/org/tests/cache/TestCacheDelete.java | 2 +- .../java/org/tests/cache/TestCacheEmbeddedId.java | 2 +- .../cache/TestCacheInterceptSaveWhenLazyLoaded.java | 2 +- .../java/org/tests/cache/TestCacheManyToOne.java | 2 +- .../java/org/tests/cache/TestCacheNaturalId.java | 2 +- .../org/tests/cache/TestExternalNotification.java | 2 +- .../org/tests/cache/TestL2CacheWithSharedBean.java | 2 +- .../org/tests/cache/TestL2DirtyFlagOnLazyLoad.java | 2 +- .../src/test/java/org/tests/cache/TestM2MCache.java | 2 +- .../test/java/org/tests/cache/TestQueryCache.java | 2 +- .../java/org/tests/cache/TestQueryCacheCountry.java | 2 +- .../java/org/tests/cache/TestQueryCacheInsert.java | 2 +- .../java/org/tests/cache/TestQueryCacheReadOnly.java | 1 + .../tests/cache/TestQueryCacheTableDependency.java | 2 +- .../org/tests/cache/personinfo/TestStringIdOnly.java | 2 +- .../java/org/tests/callable/TestMysqlCallable.java | 2 +- .../cascade/TestCascadeOrphanStatelessUpdate.java | 2 +- .../java/org/tests/cascade/TestDeleteO2MOrphans.java | 2 +- .../org/tests/cascade/TestMasterDetailDelete.java | 2 +- .../org/tests/cascade/TestMultiCascadeBatch.java | 2 +- .../java/org/tests/cascade/TestOnlyKillOrphans.java | 2 +- .../test/java/org/tests/cascade/TestOrderedList.java | 2 +- .../java/org/tests/cascade/TestPrivateOwned.java | 2 +- .../cascade/TestPrivateOwnedAddRemoveOrphan.java | 2 +- .../tests/cascade/TestPrivateOwnedCascadeOrder.java | 2 +- .../TestPrivateOwnedIgnoreTransientOrphan.java | 2 +- .../test/java/org/tests/changelog/TestChangeLog.java | 2 +- .../java/org/tests/changelog/TestChangeLogInt.java | 2 +- .../java/org/tests/compositekeys/TestCKeyDelete.java | 2 +- .../tests/compositekeys/TestCKeyIdInExpression.java | 2 +- .../org/tests/compositekeys/TestCKeyLazyLoad.java | 2 +- .../TestCaoCompositeKeyWithAnnotationOverrides.java | 2 +- .../test/java/org/tests/compositekeys/TestCore.java | 2 +- ...TestOnCascadeDeleteChildrenWithCompositeKeys.java | 2 +- .../tests/contructor/TestProtectedConstructor.java | 2 +- .../test/java/org/tests/ddl/TestForeignKeyModes.java | 4 ++-- .../java/org/tests/defaultvalues/TestDefaults.java | 2 +- .../org/tests/delete/TestDeleteByIdUsingModel.java | 2 +- .../delete/TestDeleteByIdWithPersistenceContext.java | 2 +- .../java/org/tests/delete/TestDeleteByQuery.java | 3 ++- .../tests/delete/TestDeleteCascadeWithListener.java | 2 +- .../delete/TestDeleteWithoutOptimisticLocking.java | 2 +- .../java/org/tests/docstore/CustomerReportTest.java | 2 +- .../test/java/org/tests/draftable/DocLinkTest.java | 2 +- .../src/test/java/org/tests/el/TestELBasic.java | 2 +- .../test/java/org/tests/el/TestUnderscoreParam.java | 2 +- .../tests/enhancement/TestConstructorManyAddAll.java | 2 +- .../TestConstructorPutfieldReplacement.java | 2 +- .../org/tests/enhancement/TestEnhancementEquals.java | 2 +- .../expression/bitwise/TestBitwiseExpressions.java | 2 +- .../test/java/org/tests/family/TestInheritance.java | 4 ++-- .../org/tests/generated/TestGeneratedProperties.java | 2 +- .../java/org/tests/generated/TestGeneratedWho.java | 2 +- .../src/test/java/org/tests/genkey/TestSeqBatch.java | 2 +- .../java/org/tests/history/TestHistoryInsert.java | 3 ++- .../src/test/java/org/tests/idkeys/TestCustomId.java | 2 +- .../java/org/tests/idkeys/TestGeneratedKeys.java | 12 ++++++------ .../src/test/java/org/tests/idkeys/TestLazyLoad.java | 2 +- .../java/org/tests/idkeys/TestSimpleIdInsert.java | 2 +- .../tests/inheritance/TestDuplicateKeyException.java | 2 +- .../org/tests/inheritance/TestInheritInsert.java | 2 +- .../TestInheritanceDiscriminatorQueryCache.java | 2 +- .../org/tests/inheritance/TestInheritanceJoins.java | 2 +- .../org/tests/inheritance/TestInheritanceOnMany.java | 2 +- .../inheritance/TestInheritanceOrderColumn.java | 2 +- .../org/tests/inheritance/TestInheritanceQuery.java | 2 +- .../org/tests/inheritance/TestInheritanceRawSql.java | 2 +- .../tests/inheritance/TestInheritanceRefBean.java | 2 +- .../java/org/tests/inheritance/TestIntInherit.java | 2 +- .../tests/inheritance/TestNpeOnDiscriminator.java | 2 +- .../java/org/tests/inheritance/TestSkippable.java | 2 +- .../org/tests/inheritance/TestTreeOrganisations.java | 2 +- .../inheritance/abstrakt/TestInheritanceNum.java | 2 +- .../bothsides/TestInheritanceBothSides.java | 2 +- .../inheritance/cache/TestInheritanceCache.java | 2 +- .../inheritance/cache/TestInheritanceRefCache.java | 2 +- .../cascadedelete/TestInheritanceDeleteCascade.java | 2 +- .../java/org/tests/insert/TestInsertCheckUnique.java | 2 +- .../java/org/tests/insert/TestInsertCollection.java | 2 +- .../insert/TestInsertDataIntegrityException.java | 4 ++-- .../org/tests/insert/TestInsertDuplicateKey.java | 2 +- .../java/org/tests/insert/TestInsertOnStringKey.java | 2 +- .../org/tests/insert/TestInsertWithIdAndUuid.java | 2 +- .../test/java/org/tests/insert/TestOnlyIdEntity.java | 4 ++-- .../tests/insert/TestSaveWithDaylightSavings.java | 2 +- .../src/test/java/org/tests/iud/TestCarWheelIud.java | 2 +- .../test/java/org/tests/iud/TestInfoOneToOne.java | 2 +- .../java/org/tests/iud/TestInsertQueryUpdate.java | 2 +- .../java/org/tests/iud/TestInsertUpdateTrans.java | 2 +- .../test/java/org/tests/iud/TestPersistCascade.java | 2 +- .../test/java/org/tests/json/TestDbJson_Jackson.java | 2 +- .../java/org/tests/json/TestDbJson_Jackson2.java | 2 +- .../java/org/tests/json/TestDbJson_Jackson3.java | 4 ++-- .../test/java/org/tests/json/TestDbJson_List.java | 4 ++-- .../test/java/org/tests/json/TestJsonMapBasic.java | 4 ++-- .../test/java/org/tests/json/TestJsonMapBlob.java | 2 +- .../test/java/org/tests/json/TestJsonMapClob.java | 2 +- .../test/java/org/tests/json/TestJsonMapJsonB.java | 2 +- .../test/java/org/tests/json/TestJsonMapVarchar.java | 2 +- .../test/java/org/tests/json/TestJsonNodeBasic.java | 2 +- .../test/java/org/tests/json/TestJsonNodeBlob.java | 2 +- .../test/java/org/tests/json/TestJsonNodeJsonb.java | 2 +- .../java/org/tests/json/TestJsonNodeVarchar.java | 2 +- .../test/java/org/tests/json/TestJsonNullValues.java | 2 +- .../java/org/tests/json/TestJsonSourceDefault.java | 2 +- .../src/test/java/org/tests/json/TestOldValue.java | 2 +- .../java/org/tests/json/TestUnmappedProperties.java | 2 +- .../tests/lazyforeignkeys/TestLazyForeignKeys.java | 8 ++++---- .../java/org/tests/level/test/ManyToManyTest.java | 2 +- .../tests/lifecycle/TestLifecycleAnnotatedBean.java | 2 +- .../org/tests/lifecycle/TestLifecycleExceptions.java | 2 +- .../org/tests/lifecycle/TestLifecycleWithLog.java | 2 +- .../tests/m2m/TestM2MDeleteCascadeFromParent.java | 2 +- .../java/org/tests/m2m/TestM2MDeleteNoCascade.java | 4 ++-- .../m2m/TestM2MDeleteObjectWithCascadeToM2m.java | 2 +- .../java/org/tests/m2m/TestM2MDeleteWithCascade.java | 2 +- .../org/tests/m2m/TestM2MDistinct_sqlServer.java | 4 ++-- .../test/java/org/tests/m2m/TestM2MModifyTest.java | 2 +- .../java/org/tests/m2m/TestM2MMultipleLists.java | 2 +- .../java/org/tests/m2m/TestM2MSelfRelationship.java | 2 +- .../test/java/org/tests/m2m/TestM2mDeleteObject.java | 2 +- .../m2m/softdelete/TestM2MSoftDeleteExists.java | 2 +- .../test/java/org/tests/merge/TestMergeBasic.java | 2 +- .../test/java/org/tests/merge/TestMergeCustomer.java | 1 + .../src/test/java/org/tests/merge/TestMergeM2M.java | 2 +- .../tests/model/aggregation/TestAggregationMany.java | 2 +- .../model/aggregation/TestAggregationTopLevel.java | 2 +- .../org/tests/model/array/TestDbArray_asSet.java | 4 ++-- .../org/tests/model/array/TestDbArray_basic.java | 5 +++-- .../basic/cache/TestCacheViaComplexNaturalKey.java | 2 +- .../basic/cache/TestCacheViaComplexNaturalKey3.java | 2 +- .../model/basic/cache/TestCacheWithSoftDelete.java | 2 +- .../model/basic/cache/TestNatKeyCacheWhenNull.java | 2 +- .../basic/cache/TestNatKeyCacheWithForeignKey.java | 2 +- .../org/tests/model/basic/cache/TestNatKeyUid.java | 2 +- .../org/tests/model/basic/first/TestFirstSecond.java | 2 +- .../model/basic/mapsuper/TestMapSuperEquals.java | 2 +- .../model/basic/xtra/TestDeleteUnloadedChildren.java | 2 +- .../xtra/TestInsertBatchThenFlushThenUpdate.java | 4 ++-- .../model/basic/xtra/TestInsertBatchThenUpdate.java | 4 ++-- .../xtra/TestInsertBatchWithDifferentRootTypes.java | 4 ++-- .../model/bridge/TestExplicitM2MBridgeTable.java | 2 +- .../org/tests/model/bridge/TestIdClassScalar.java | 2 +- .../carwheeltruck/TestInheritSoftDeleteJoin.java | 2 +- .../carwheeltruck/TestMTOInheritNoDiscriminator.java | 2 +- .../carwheeltruck/TestTruckCarWheelInhertiance.java | 2 +- .../model/composite/TestCompositeKeyUserClient.java | 2 +- .../tests/model/elementcollection/EcmPersonTest.java | 2 +- .../tests/model/elementcollection/EcsPersonTest.java | 2 +- .../TestElementCollectionBasic.java | 2 +- .../TestElementCollectionBasicCache.java | 2 +- .../TestElementCollectionBasicMap.java | 2 +- .../TestElementCollectionBasicMapAsLob.java | 2 +- .../TestElementCollectionBasicMapCache.java | 2 +- .../TestElementCollectionBasicSet.java | 2 +- .../TestElementCollectionCascade.java | 2 +- .../TestElementCollectionCascadeMultiple.java | 2 +- .../TestElementCollectionEmbeddedList.java | 2 +- .../TestElementCollectionEmbeddedListCache.java | 2 +- .../TestElementCollectionEmbeddedListCache2.java | 2 +- .../TestElementCollectionEmbeddedMap.java | 2 +- .../TestElementCollectionEmbeddedMapCache.java | 2 +- .../TestElementCollectionEnumSet.java | 2 +- .../TestElementCollectionResused.java | 2 +- .../model/embedded/TestEmbeddedAttrOverride.java | 2 +- .../tests/model/embedded/TestEmbeddedManyToOne.java | 2 +- .../model/embedded/TestEmbeddedNullableOverride.java | 2 +- .../tests/model/history/TestHistoryEmbeddedId.java | 4 ++-- .../org/tests/model/history/TestHistoryExclude.java | 4 ++-- .../org/tests/model/history/TestHistoryInclude.java | 4 ++-- .../tests/model/history/TestHistoryOneToMany.java | 4 ++-- .../model/history/TestHistorySoftDeleteOneToOne.java | 2 +- .../test/TestInheritExposeDtype.java | 2 +- .../inheritmany/TestMediaInheritanceJoinToMany.java | 2 +- .../org/tests/model/interfaces/TestSelfMany.java | 2 +- .../org/tests/model/interfaces/TestTargetEntity.java | 2 +- .../tests/model/ivo/test/TestAttributeConverter.java | 2 +- .../org/tests/model/joda/TestJodaInsertUpdate.java | 2 +- .../org/tests/model/json/TestJacksonPlainBean.java | 2 +- .../lazywithcache/TestWithCacheAndLazyLoad.java | 2 +- .../org/tests/model/lazywithid/TestColumnIdName.java | 2 +- .../java/org/tests/model/m2m/TestM2MWithWhere.java | 2 +- .../java/org/tests/model/m2o/TestManyToOneAsOne.java | 4 ++-- .../test/java/org/tests/model/nofk/Test2NoFk.java | 2 +- .../src/test/java/org/tests/model/nofk/TestNoFk.java | 2 +- .../org/tests/model/noid/TestInsertNoIdBean.java | 2 +- .../model/onetoone/TestOneToOneCascadeSave.java | 2 +- .../model/onetoone/TestOneToOneImportedPkNative.java | 2 +- .../tests/model/onetoone/TestOneToOneJoinColumn.java | 2 +- .../onetoone/TestOneToOneOptionalRelationship.java | 2 +- .../model/onetoone/TestOneToOneOrphanRemove.java | 4 ++-- .../model/onetoone/TestOneToOneOrphanStringId.java | 2 +- .../model/onetoone/TestOneToOnePrimaryKeyJoin.java | 2 +- .../onetoone/TestOneToOnePrimaryKeyJoinBidi.java | 2 +- .../onetoone/TestOneToOnePrimaryKeyJoinOptional.java | 2 +- .../model/onetoone/TestOneToOneSoftDeleteChild.java | 2 +- .../onetoone/album/DeleteById_SoftDelete_Tests.java | 2 +- .../model/onetoone/album/TestOneToOneHardDelete.java | 2 +- .../model/orphanremoval/TestOrphanRemoveO2M.java | 2 +- .../model/orphanremoval/TestOrphanRemoveO2MFlat.java | 2 +- .../org/tests/model/prnt/TestPrinterStateIssue.java | 2 +- .../test/java/org/tests/model/pview/TestPview.java | 2 +- .../tests/model/selfref/TestResourceFileSelfRef.java | 2 +- .../org/tests/model/selfref/TestSelfRefExample.java | 2 +- .../org/tests/model/selfref/TestTextJsonSelfRef.java | 2 +- .../java/org/tests/model/site/TestTreeModel.java | 2 +- .../org/tests/model/survey/TestOrderByFetch.java | 2 +- .../tests/model/tevent/TestAssocOneNullTraverse.java | 2 +- .../version/TestVersionHierarchyModification.java | 2 +- .../org/tests/model/view/TestViewBaseEntity.java | 2 +- .../test/java/org/tests/model/zero/TestWithZero.java | 2 +- .../java/org/tests/o2m/TestOneToManyEnhancement.java | 2 +- .../java/org/tests/o2m/TestOneToManyNoMappedBy.java | 2 +- .../java/org/tests/o2m/TestOneToManyOnlyBean.java | 2 +- .../test/java/org/tests/o2m/TestOneToManyWhere.java | 2 +- .../tests/o2m/jointable/TestOneToManyJoinTable.java | 2 +- .../jointable/TestOneToManyJoinTableInheritance.java | 2 +- .../jointable/TestOneToManyJoinTableNoTableName.java | 2 +- .../java/org/tests/o2m/lazy/TestLazyManyViaPath.java | 2 +- .../TestPersistenceContextOnUpdateDuringTxn.java | 2 +- .../TestPersistenceContextQueryScope.java | 2 +- .../TestPersistenceContextScopeUsingOrders.java | 2 +- .../TestPersistenceContextServerConfig.java | 1 + .../query/TestAddOrderByWithFirstRowsMaxRows.java | 2 +- .../org/tests/query/TestAutofetchTuneWithJoin.java | 2 +- .../org/tests/query/TestConnectionCloseOnSqlerr.java | 2 +- .../java/org/tests/query/TestDefaultFetchLazy.java | 2 +- .../org/tests/query/TestExprNestedDisjunction.java | 2 +- .../java/org/tests/query/TestFindOneOrEmpty.java | 2 +- .../src/test/java/org/tests/query/TestIContains.java | 1 + .../query/TestImplicitJoinOnParentRelationship.java | 2 +- .../java/org/tests/query/TestInvalidFetchPath.java | 2 +- .../java/org/tests/query/TestJoinOptOneCascade.java | 2 +- .../org/tests/query/TestLimitAlterFetchMany.java | 2 +- .../test/java/org/tests/query/TestLimitQuery.java | 2 +- .../test/java/org/tests/query/TestManyWhereJoin.java | 2 +- .../java/org/tests/query/TestManyWhereJoinM2M.java | 2 +- .../java/org/tests/query/TestMyAdHocSqlSelect.java | 1 + .../tests/query/TestOneToManyCorrectGrouping.java | 2 +- .../src/test/java/org/tests/query/TestOuterJoin.java | 2 +- .../test/java/org/tests/query/TestQueryAlias.java | 4 ++-- .../java/org/tests/query/TestQueryBaseTable.java | 4 ++-- .../test/java/org/tests/query/TestQueryExists.java | 2 +- .../org/tests/query/TestQueryFetchJoinWithOrder.java | 2 +- .../org/tests/query/TestQueryFetchManyTwoDeep.java | 2 +- .../java/org/tests/query/TestQueryFetchSkipPath.java | 2 +- .../tests/query/TestQueryFilterCaseInsensitive.java | 2 +- .../java/org/tests/query/TestQueryFilterMany.java | 2 +- .../org/tests/query/TestQueryFilterManyOnM2M.java | 2 +- .../tests/query/TestQueryFilterManyOnSecondary.java | 2 +- .../org/tests/query/TestQueryFilterManySimple.java | 2 +- .../test/java/org/tests/query/TestQueryFindEach.java | 2 +- .../java/org/tests/query/TestQueryFindEachWhile.java | 2 +- .../org/tests/query/TestQueryFindFutureList.java | 2 +- .../java/org/tests/query/TestQueryFindIterate.java | 4 ++-- .../org/tests/query/TestQueryFindMapTypedKey.java | 2 +- .../java/org/tests/query/TestQueryFindNative.java | 2 +- .../java/org/tests/query/TestQueryFindPagedList.java | 2 +- .../java/org/tests/query/TestQueryFindReadOnly.java | 2 +- .../java/org/tests/query/TestQueryFindStream.java | 2 +- .../java/org/tests/query/TestQueryInAssocOne.java | 2 +- .../org/tests/query/TestQueryInIdTypeConversion.java | 2 +- .../test/java/org/tests/query/TestQueryIsNull.java | 2 +- .../java/org/tests/query/TestQueryJoinBatchSize.java | 2 +- .../org/tests/query/TestQueryJoinMulipleMany.java | 2 +- .../org/tests/query/TestQueryMultiJoinFetchPath.java | 2 +- .../org/tests/query/TestQueryMultiManyOrder.java | 2 +- .../java/org/tests/query/TestQueryNullAssocOne.java | 2 +- .../java/org/tests/query/TestQueryOrderById.java | 2 +- .../org/tests/query/TestQueryPathJoinAndOrder.java | 2 +- .../org/tests/query/TestQueryPlanCacheRowCount.java | 2 +- .../java/org/tests/query/TestRefToLazyLoadMany.java | 2 +- .../src/test/java/org/tests/query/TestRowCount.java | 2 +- .../src/test/java/org/tests/query/TestSubQuery.java | 2 +- .../org/tests/query/TestThreeLevelQueryJoin.java | 2 +- .../src/test/java/org/tests/query/TestWhereIn.java | 2 +- .../java/org/tests/query/TestWhereRawClause.java | 4 ++-- .../query/aggregation/TestAggregationCount.java | 2 +- .../tests/query/autotune/TestAutoTuneProfiling.java | 2 +- .../java/org/tests/query/cache/TestDistinct.java | 2 +- .../org/tests/query/cancel/SqlQueryCancelTest.java | 3 ++- .../TestFilteringByEmbeddedInJoinedTable.java | 2 +- .../query/embedded/TestMultipleEmbeddedLoading.java | 2 +- .../org/tests/query/finder/TestCustomerFinder.java | 4 ++-- .../query/joins/TestDisjunctWhereOuterJoin.java | 2 +- .../query/joins/TestDisjunctWhereOuterOnMany.java | 2 +- .../tests/query/joins/TestQueryJoinManyNonRoot.java | 2 +- .../tests/query/joins/TestQueryJoinOnFormula.java | 2 +- .../tests/query/joins/TestQueryJoinQueryNonRoot.java | 2 +- .../joins/TestQueryManyToOneWhereClauseJoin.java | 2 +- .../tests/query/lazy/TestQueryDefaultBatchSize.java | 2 +- .../org/tests/query/orderby/TestOrderByClear.java | 2 +- .../tests/query/orderby/TestOrderByOnComplex.java | 2 +- .../tests/query/orderby/TestOrderByWithDistinct.java | 4 ++-- .../query/orderby/TestOrderByWithDistinctTake2.java | 2 +- .../tests/query/orderby/TestOrderByWithFunction.java | 2 +- .../org/tests/query/orderby/TestOrderByWithMany.java | 2 +- .../org/tests/query/other/TestFetchPreference.java | 2 +- .../query/other/TestFindIdsWithInheritance.java | 2 +- .../tests/query/other/TestFindIterateHeapDump.java | 2 +- .../TestFindPartialWithConstructorSetFields.java | 2 +- .../tests/query/other/TestFormulaWithFindCount.java | 2 +- .../tests/query/other/TestManyLazyLoadingQuery.java | 2 +- .../tests/query/other/TestManyToManyLazyLoading.java | 2 +- .../org/tests/query/other/TestOneToManyAsMap.java | 2 +- .../query/other/TestQueryConversationRowCount.java | 2 +- .../org/tests/query/other/TestQueryDistinct.java | 2 +- .../query/other/TestQueryRawExpressionMany.java | 2 +- .../tests/query/other/TestQueryRowCountWithMany.java | 2 +- .../tests/query/other/TestQuerySingleAttribute.java | 1 + .../java/org/tests/query/other/TestSelfParent.java | 2 +- .../org/tests/query/other/TestSubQueryBinding.java | 1 + .../org/tests/query/other/TestWhereAnnotation.java | 2 +- .../tests/query/other/TestWhereLikeWithSlash.java | 2 +- .../java/org/tests/query/sqlquery/SqlQueryTests.java | 3 ++- .../query/sqlquery/TestNativeILikeExpression.java | 2 +- .../quotedidentifier/TestQuotedIdentifierQuery.java | 2 +- .../java/org/tests/rawsql/TestInsertSqlLogging.java | 2 +- .../java/org/tests/rawsql/TestOrderReportTotal.java | 1 + .../java/org/tests/rawsql/TestRawSqlAsKeyword.java | 1 + .../tests/rawsql/TestRawSqlCustomerAggregate.java | 1 + .../org/tests/rawsql/TestRawSqlMasterDetail.java | 2 +- .../java/org/tests/rawsql/TestRawSqlNamedParams.java | 3 ++- .../java/org/tests/rawsql/TestRawSqlOrmQuery.java | 3 ++- .../org/tests/rawsql/TestRawSqlOrmQueryDistinct.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper2.java | 1 + .../java/org/tests/rawsql/TestRawSqlOrmWrapper3.java | 2 +- .../org/tests/rawsql/TestRawSqlPositionedParams.java | 2 +- .../org/tests/rawsql/TestRawSqlUnparsedQuery.java | 2 +- .../org/tests/rawsql/TestRawSqlWithResultSet.java | 1 + .../org/tests/rawsql/inherit/ParentQueryTest.java | 2 +- .../org/tests/rawsql/inherit/ParentRawSqlTest.java | 2 +- .../tests/rawsql/nativesql/TestNativeSqlBasic.java | 4 ++-- .../rawsql/nativesql/TestNativeWithEmbedded.java | 2 +- .../test/java/org/tests/readaudit/TestReadAudit.java | 2 +- .../org/tests/repository/TestBeanRepository.java | 2 +- .../tests/saveassociation/TestSaveAssociation.java | 2 +- .../org/tests/saveassociation/TestSaveSamePK.java | 2 +- .../singleTableInheritance/TestInheritQuery.java | 2 +- .../org/tests/softdelete/TestSoftDeleteBasic.java | 1 + .../org/tests/softdelete/TestSoftDeleteBook.java | 2 +- .../tests/softdelete/TestSoftDeleteManyToMany.java | 2 +- .../TestSoftDeleteOptionalRelationship.java | 2 +- .../tests/softdelete/TestSoftDeleteOtoCascade.java | 2 +- .../softdelete/TestSoftDeleteStatelessUpdate.java | 2 +- .../java/org/tests/softdelete/TestSoftDeleteTop.java | 2 +- .../java/org/tests/sp/TestManyToManySaveTwice.java | 2 +- .../java/org/tests/test/TestInheritWithMany.java | 2 +- .../org/tests/text/csv/TestTimeStringParser.java | 2 +- .../tests/text/json/TestJsonBeanDescriptorParse.java | 2 +- .../tests/text/json/TestJsonBeanWithTimeZone.java | 2 +- .../text/json/TestJsonInheritanceDiscriminator.java | 2 +- .../test/java/org/tests/text/json/TestJsonMap.java | 2 +- .../java/org/tests/text/json/TestJsonSimple.java | 2 +- .../text/json/TestJsonSomeEnumWithToString.java | 2 +- .../tests/text/json/TestTextJsonBeanReadVisitor.java | 2 +- .../tests/text/json/TestTextJsonCompoundType.java | 2 +- .../org/tests/text/json/TestTextJsonInheritance.java | 2 +- .../tests/text/json/TestTextJsonInsertUpdate.java | 2 +- .../org/tests/text/json/TestTextJsonInvokeLazy.java | 2 +- .../text/json/TestTextJsonReadManyLazyLoad.java | 2 +- .../tests/text/json/TestTextJsonReferenceBean.java | 2 +- .../java/org/tests/text/json/TestTextJsonSimple.java | 2 +- .../org/tests/text/json/TestTextJsonSuperSimple.java | 2 +- .../org/tests/transaction/TestBatchModelFlush.java | 2 +- .../tests/transaction/TestBatchPersistCascade.java | 4 ++-- .../org/tests/transaction/TestBeanStateReset.java | 2 +- .../TestBeginTransactionWithExisting.java | 2 +- .../org/tests/transaction/TestCommitAndContinue.java | 4 ++-- .../TestCreateTransactionWithIsolation.java | 2 +- .../TestDeleteFromPersistenceContext.java | 2 +- .../org/tests/transaction/TestExecuteComplete.java | 3 ++- .../org/tests/transaction/TestInsertManyAndRef.java | 2 +- .../test/java/org/tests/transaction/TestNested.java | 2 +- .../tests/transaction/TestNestedBeginRequired.java | 1 + .../TestNestedBeginRequiredWithFailure.java | 1 + .../transaction/TestNestedBeginRequiresNew.java | 1 + .../TestNestedBeginRequiresNewWithFailure.java | 1 + .../org/tests/transaction/TestNestedMandatory.java | 2 +- .../tests/transaction/TestNestedSubTransaction.java | 3 ++- .../org/tests/transaction/TestNestedTransaction.java | 2 +- .../tests/transaction/TestPersistContextClear.java | 2 +- .../java/org/tests/transaction/TestSavepoint.java | 4 ++-- .../org/tests/transaction/TestSqlServerBatch.java | 4 ++-- .../transaction/TestStatelessUpdateClearPC.java | 2 +- .../tests/transaction/TestTransactionCallback.java | 2 +- .../tests/transaction/TestTransactionSkipCache.java | 2 +- .../transaction/TestTransactionTryResources.java | 4 ++-- .../tests/transaction/TestTransactionalNever.java | 2 +- .../transaction/TestTransactionalNotSupports.java | 2 +- .../tests/transaction/TestTransactionalReadOnly.java | 2 +- .../tests/transaction/TestTransactionalRequired.java | 2 +- .../transaction/TestTransactionalRequiresNew.java | 1 + .../tests/transaction/TestTransactionalSupports.java | 2 +- .../transparentpersist/TestTransparentPersist.java | 1 + .../java/org/tests/types/TestEncryptedString.java | 2 +- .../src/test/java/org/tests/types/TestFileType.java | 2 +- .../java/org/tests/types/TestFileTypeFetching.java | 2 +- .../src/test/java/org/tests/types/TestHstore.java | 2 +- .../src/test/java/org/tests/types/TestNewTypes.java | 2 +- .../test/java/org/tests/types/TestPeriodType.java | 2 +- .../org/tests/unidirectional/TestUniDirectional.java | 2 +- .../org/tests/unitinternal/TestEqualsOnEnhanced.java | 2 +- .../tests/unitinternal/TestNullCollectionSet.java | 2 +- .../org/tests/unitinternal/TestOrderByParse.java | 2 +- .../unitinternal/TestTxTypeOnTransactional.java | 2 +- .../tests/unitinternal/TestVanillaCollectionSet.java | 2 +- .../org/tests/update/TestEmbeddedRefreshUpdate.java | 2 +- .../org/tests/update/TestJsonStatelessUpdate.java | 2 +- .../test/java/org/tests/update/TestMarkAsDirty.java | 2 +- .../java/org/tests/update/TestPostgresTruncate.java | 2 +- .../java/org/tests/update/TestSqlUpdateBatch.java | 2 +- .../tests/update/TestSqlUpdateBindMultipleLists.java | 2 +- .../org/tests/update/TestSqlUpdateExceptions.java | 1 + .../java/org/tests/update/TestSqlUpdateInTxn.java | 2 +- .../java/org/tests/update/TestSqlUpdateUpsert.java | 6 +++--- .../tests/update/TestUpdateAllLoadedProperties.java | 2 +- .../org/tests/update/TestUpdateCircularSave.java | 2 +- .../java/org/tests/update/TestUpdatePartial.java | 2 +- .../org/tests/update/TestUpdatePartialNoVer.java | 2 +- 603 files changed, 689 insertions(+), 640 deletions(-) rename ebean-test/src/test/java/io/ebean/{ => xtest}/BaseTestCase.java (99%) rename ebean-test/src/test/java/io/ebean/{annotation => xtest}/ForPlatform.java (85%) rename ebean-test/src/test/java/io/ebean/{annotation => xtest}/IgnorePlatform.java (86%) diff --git a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java index eb94870d9..bdd2546b9 100644 --- a/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java +++ b/ebean-test/src/test/java/io/ebean/DbPrimaryTest.java @@ -1,6 +1,7 @@ package io.ebean; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java index 21e28d2a3..3621affd0 100644 --- a/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java +++ b/ebean-test/src/test/java/io/ebean/test/DbJsonTest.java @@ -1,7 +1,7 @@ package io.ebean.test; import com.fasterxml.jackson.databind.JsonNode; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.etest.BSimpleFor; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/BaseTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java similarity index 99% rename from ebean-test/src/test/java/io/ebean/BaseTestCase.java rename to ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java index 139e49e26..059cdae68 100644 --- a/ebean-test/src/test/java/io/ebean/BaseTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java @@ -1,5 +1,6 @@ -package io.ebean; +package io.ebean.xtest; +import io.ebean.*; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java b/ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java similarity index 85% rename from ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java rename to ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java index a69c42e9a..43b66cdf9 100644 --- a/ebean-test/src/test/java/io/ebean/annotation/ForPlatform.java +++ b/ebean-test/src/test/java/io/ebean/xtest/ForPlatform.java @@ -1,4 +1,6 @@ -package io.ebean.annotation; +package io.ebean.xtest; + +import io.ebean.annotation.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java b/ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java similarity index 86% rename from ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java rename to ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java index 6fafc4852..ac3eb488a 100644 --- a/ebean-test/src/test/java/io/ebean/annotation/IgnorePlatform.java +++ b/ebean-test/src/test/java/io/ebean/xtest/IgnorePlatform.java @@ -1,4 +1,6 @@ -package io.ebean.annotation; +package io.ebean.xtest; + +import io.ebean.annotation.Platform; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java index 36f667956..8b86e635c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DtoQuery; import io.ebean.QueryIterator; import io.ebean.meta.BasicMetricVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index a54f4dd24..101e8a370 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery; import io.ebean.ProfileLocation; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java index 26b32bd05..4717fabf4 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery; import io.ebean.SqlRow; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaQueryMetric; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java index c263240f0..33d9a4f8d 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.*; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java index 54d9fd45b..a8db827a3 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteAllByIdTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java index 5bc087199..2f1fa3a13 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteByIdTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java index 39c9e2469..e719fdfe8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_deleteTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index 6c5927d21..e41d914b9 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java index f0aa638b7..1bf75ad6b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_saveAllTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java index e285b3849..602a046c0 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/ExtendedServerTest.java @@ -1,6 +1,7 @@ package io.ebean.xtest.base; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java index 76925f4e3..010d6460c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/FetchGroupTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.FetchGroup; import io.ebean.Query; import io.ebean.service.SpiFetchGroupQuery; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java index eada8ae2d..3a6983f40 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/PlatformCondition.java @@ -1,8 +1,8 @@ package io.ebean.xtest.base; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.extension.ConditionEvaluationResult; import org.junit.jupiter.api.extension.ExecutionCondition; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java index bac0f7aaf..f44d7a37d 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/SqlRowBooleanTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java index 1a3892a46..ecae57e76 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestDirtyProperties.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.ValuePair; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java index 756dfdfa8..feb625990 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestFilterWithEnum.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Filter; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java index 4f1f01e60..024b7951b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TestUnsetLoadedProperties.java @@ -1,9 +1,9 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.bean.EntityBean; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java index 13be5bbc7..225888156 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/TransactionalTestCase.java @@ -1,6 +1,6 @@ package io.ebean.xtest.base; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java index 62ee44b5b..1b44e44b2 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/UpdateQueryTest.java @@ -1,8 +1,9 @@ package io.ebean.xtest.base; import io.ebean.*; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.ServerMetrics; diff --git a/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java index e4a22bed4..dfed8b276 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/bean/EntityBeanInterceptTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.bean; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index bdeb926e8..a1a4adae8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -3,7 +3,7 @@ package io.ebean.xtest.config; import io.ebean.Database; import io.ebean.DatabaseFactory; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java index 699bd5566..e98a66368 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/TestTableName.java @@ -1,6 +1,6 @@ package io.ebean.xtest.config; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.TableName; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java index 35ad4aa4f..38ae7f3d8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/DatabasePlatformBaseTest.java @@ -1,8 +1,8 @@ package io.ebean.xtest.config.dbplatform; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java index eefbd9138..a2ffd5f7c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/dbplatform/sqlserver/SqlServerStepSequenceTest.java @@ -1,8 +1,8 @@ package io.ebean.xtest.config.dbplatform.sqlserver; import io.ebean.BackgroundExecutor; -import io.ebean.BaseTestCase; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.sqlserver.SqlServerStepSequence; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java index 212c41bb5..2625d992c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/docstore/DocStoreBeanBaseAdapterTest.java @@ -1,7 +1,7 @@ package io.ebean.xtest.docstore; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Query; import io.ebean.docstore.DocUpdateContext; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java index 8869c6f69..33b275f02 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanFindControllerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.bean.BeanCollection; diff --git a/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java index b463129cd..a4a8ec6e0 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/event/BeanPostLoadTest.java @@ -4,6 +4,7 @@ package io.ebean.xtest.event; import io.ebean.*; import io.ebean.config.DatabaseConfig; import io.ebean.event.BeanPostLoad; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java index 7f8c2231a..81a382ce8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/cluster/binarymessage/BinaryTransactionEventReadWriteTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.cluster.binarymessage; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.EbeanServer; import io.ebean.xtest.internal.api.TDSpiEbeanServer; import io.ebeaninternal.api.TransactionEventTable; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java index 97f71318a..399cf70de 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/executor/TestShutdownWithBackgroundTasks.java @@ -1,7 +1,7 @@ package io.ebean.xtest.internal.server.executor; import io.ebean.BackgroundExecutor; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java index 366b5ec6a..73128d908 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/grammer/EqlParserTest.java @@ -1,10 +1,10 @@ package io.ebean.xtest.internal.server.grammer; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebeaninternal.api.SpiQuery; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java index 3cd0582fc..5508d7f99 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/lib/ShutdownManagerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.lib; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DatabaseFactory; import io.ebean.event.ShutdownManager; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java index 6c110457b..3c7caa12e 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/LimitOffsetPagedListTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.query.LimitOffsetPagedList; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java index bd44347c7..27663c6f3 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/query/TestFutureRowCountErrorHandling.java @@ -1,6 +1,7 @@ package io.ebean.xtest.internal.server.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.query.QueryFutureIds; import io.ebeaninternal.server.query.QueryFutureList; import io.ebeaninternal.server.query.QueryFutureRowCount; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java index 5af99b4ef..816ada0c8 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlBuilder.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourceConfig; import io.ebeaninternal.server.core.DefaultServer; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java index faaf7638d..e11a0f991 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/rawsql/TestRawSqlParsing.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.rawsql.SpiRawSql.Sql; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java index 880c62c7e..2c66288c7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestJsonWriteVisitor.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteBeanVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java index 825b0bf1d..72efba9d1 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonReadBeanVisitor; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java index 0e6a66f31..f2fd8cf62 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/DefaultTransactionThreadLocalTest.java @@ -1,7 +1,8 @@ package io.ebean.xtest.internal.server.transaction; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java index e7f70f66c..0229250b7 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionManagerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TxScope; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java index 6d104dc70..25d4d839b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/server/transaction/TransactionTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.internal.server.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java index 3da9db351..9c4cfdc0c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/json/JsonBeanReaderTest.java @@ -1,7 +1,7 @@ package io.ebean.xtest.json; import com.fasterxml.jackson.core.JsonParser; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.PersistenceContext; import io.ebean.text.json.JsonBeanReader; diff --git a/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java index cc3bec462..e5669c2dc 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/plugin/SpiServerTest.java @@ -1,6 +1,6 @@ package io.ebean.xtest.plugin; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.plugin.BeanType; diff --git a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java index 620e9ab20..379b5bd92 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java +++ b/ebean-test/src/test/java/io/ebean/xtest/text/PathPropertiesTests.java @@ -1,6 +1,6 @@ package io.ebean.xtest.text; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; 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 51115c8c3..e2412d08b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java @@ -1,7 +1,8 @@ package io.ebeaninternal.dbmigration; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.DbHistorySupport; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java index 4bcb40b8e..886a05618 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CacheBeanDataTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.PersistenceContext; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java index cd6114904..1469e4fb2 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataFromBeanTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java index 08988cfce..b4804b97a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/cache/CachedBeanDataSerializeTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 86bab509f..88828f78b 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.event.changelog.BeanChange; import io.ebean.event.changelog.ChangeSet; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java index 75d0a673f..d45c249fc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogListenerTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.event.changelog.ChangeSet; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java index d639abf65..c1b1536ad 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/changelog/DefaultChangeLogRegisterTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.event.changelog.ChangeLogFilter; import org.junit.jupiter.api.Test; import org.tests.inheritance.model.ProductConfiguration; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java index b600aefc9..d4dd8f389 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_createOrmQueryRequestTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.Query; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java index a7dbc0165..28f058595 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/DefaultServer_getReferenceTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java index 5a91d0416..03c82cde0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpSimple.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ValuePair; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java index 6b3371bfb..2a7018e52 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/core/TestDiffHelpWithEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.core; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ValuePair; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index 382397c9b..14cc5208c 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java index 063a7a515..e4c4620c3 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_documentMappingTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeanservice.docstore.api.mapping.DocPropertyAdapter; import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java index 3407b37be..21296cabf 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptor_whenCreatedPropertyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java index eadc01968..cc966accc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java index 76462d577..f81eb37b0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/DeployPropertyParserTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java index 71b888046..11b61ad06 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/FormulaPropertyPathTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java index 112fcf345..72bfccdde 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestBeanDescriptorHasIdProperty.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java index 406dbd2ef..de8dbdadc 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestCollectionLoadedStatus.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java index 6ad4e5ba0..22a4eb8f0 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertSimple.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java index f835cc427..b1e661220 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestDiffHelpInsertWithEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java index b2d302848..d271374ac 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestNotEnhancedMappedSuper.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java index 551db2d8e..c8b4ac78a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/deploy/TestReferenceWithConstructorProperties.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java index ef44734b8..4f8bed0c7 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/BaseExpressionTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.EbeanServer; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java index db93edf36..9f6d3ebf6 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/IsEmptyExpressionQueryTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java index 58e33b9d2..125c2ac21 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/expression/PrepareDocNestedTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.expression; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebeaninternal.api.SpiExpression; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java index a4499ae96..260b5bb76 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/loadcontext/DLoadContextTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.loadcontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.FetchConfig; import io.ebean.Query; import io.ebeaninternal.server.core.OrmQueryRequest; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java index 305e7694b..f4a6d421a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/DefaultOrmQueryTest.java @@ -1,7 +1,7 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebeaninternal.api.BindValuesKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java index 189fd4457..31849f1e4 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/querydefn/OrmQueryDetailTest.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java index b96c190f7..abf0d9d49 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestBinaryUUID.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java index 74c4fcd7a..00c9be698 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestSimpleEncryptor.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.EncryptKey; import org.junit.jupiter.api.Test; import org.tests.basic.encrypt.BasicEncryptKey; diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index 61f9bfb69..309a00604 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.DatabaseConfig; import io.ebean.config.dbplatform.h2.H2Platform; import io.ebean.core.type.DataReader; diff --git a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java index 81e25b80a..64a6ddf4d 100644 --- a/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsBeforeAfterTest.java @@ -1,8 +1,8 @@ package org.etest; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; diff --git a/ebean-test/src/test/java/org/etest/ForTestsTest.java b/ebean-test/src/test/java/org/etest/ForTestsTest.java index c475ecfce..27466814a 100644 --- a/ebean-test/src/test/java/org/etest/ForTestsTest.java +++ b/ebean-test/src/test/java/org/etest/ForTestsTest.java @@ -1,9 +1,9 @@ package org.etest; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.test.ForTests; diff --git a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 4e962ae92..a70a4cc35 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -1,6 +1,6 @@ package org.multitenant.partition; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java index 97f66b7c6..a1dca6a5d 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateFormula.java @@ -1,8 +1,8 @@ package org.tests.aggregateformula; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java index f7f9a3df7..e3289c3f1 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/TestAggregateInheritFormula.java @@ -1,6 +1,6 @@ package org.tests.aggregateformula; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 547483ceb..034088063 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.annotation.Index; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; diff --git a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java index d32d86d4c..1ab8abc7a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAssocOneEqExpression.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java index a619cebce..257b40d74 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazy.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java index efe924f85..1e3cbab52 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBatchLazyMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java index 74e2441a5..c0c397e6c 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java +++ b/ebean-test/src/test/java/org/tests/basic/TestBeanReferenceRefresh.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java index 4365d4860..1993ebe25 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestCreateEntityBean.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EDefaultProp; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java index eabcbb380..9e15fd49d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteCascadingOneToMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Article; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java index b873d3be6..7fa911e93 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteImportedPartial.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java index a31a70666..2b29e4554 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java index 18ba4d2ab..215b53757 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteOneToOneMultiple.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java index 824f6bca3..8ce9b3a5d 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeletePartialNoVersion.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TMapSuperEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java index 3b049591b..1174f7a34 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDynamicUpdate.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java index 35c137540..44a6c4e21 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestEnhancementCollectionInitialisation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java index 97b057392..43af42479 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java index afc456e04..9ac6d72e1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestExplicitInsert.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java index 2ebc4dab4..00fb02252 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestFetchId.java +++ b/ebean-test/src/test/java/org/tests/basic/TestFetchId.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FutureIds; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index b493a23e7..eb1ce3daf 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java index a42667b7d..6b2fe71b5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInEmpty.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java index c4b12d8e7..ebc134ff2 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java +++ b/ebean-test/src/test/java/org/tests/basic/TestInheritRef.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Car; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java index 30b98d23b..c5ed8b008 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJodaType.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJodaType.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.core.type.ScalarType; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java index 70a2290c1..f25109973 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java +++ b/ebean-test/src/test/java/org/tests/basic/TestJoinInheritance.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java index 2bf0d083a..4ecea59b1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadEmptyOneToMany.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java index 6db645e15..71a9b0bed 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLazyLoadInCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.CacheMode; import io.ebean.DB; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java index 8d7eb92f0..63183c7db 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLimitQuery.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index 920b94ed5..249a2d0b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java index 884571f8e..5d02724f1 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLogTransLogOnError.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java index 5722ffbbb..f3dc340dc 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java index 1f4e09106..4aaa4c704 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestM2MVanilla.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java index 10591aa09..f08304c90 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java index 7f601523a..c8a374302 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java +++ b/ebean-test/src/test/java/org/tests/basic/TestManyOneInterface.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java index 6c6f34fa1..f4670d2ea 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMappedSuper.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TMapSuperEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index 13073c583..e7c84da15 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Address; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java index 3a9079788..cee656644 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMultipleOneToOneIUD.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java index 030d4e3a4..881c37b39 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/TestNonUpdateProperty.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MNonUpdPropEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java index 2d8263759..84a42b683 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountFormula.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java index 4de0887c7..265f55e3f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountReportBean.java @@ -1,6 +1,7 @@ package org.tests.basic; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java index 2f647ac38..59c0bc0a8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java +++ b/ebean-test/src/test/java/org/tests/basic/TestOrderTotalAmountSql.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 82788d8a0..6312cfcf8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebeaninternal.api.SpiPersistenceContext; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java index 89217ca7a..cb45cac51 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdate.java @@ -1,7 +1,8 @@ package org.tests.basic; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java index a014c8b86..71631a880 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryForUpdatePostgresLock.java @@ -1,8 +1,8 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java index 3ea035b32..67191e6bb 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java @@ -1,9 +1,9 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Country; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java index ef755a30d..5c72400fc 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereBetween.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java index 03579c200..bd4cc3e27 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWhereInRange.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java index 63dec52d1..1a038e7f3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestQueryWithCache.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java index c9b687fae..9c018a160 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestReadOnlyPropagation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java index 2d8ad58b4..efb948bc8 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PersistentFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java index d32899dfb..af899d8c0 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSaveDeleteOneToOneMultiple.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.PFile; diff --git a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java index bf98a2d00..6869eb2b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestSharedInstancePropagation.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestTransient.java b/ebean-test/src/test/java/org/tests/basic/TestTransient.java index 9edd48cac..cc19b522a 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestTransient.java +++ b/ebean-test/src/test/java/org/tests/basic/TestTransient.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdate.java b/ebean-test/src/test/java/org/tests/basic/TestUpdate.java index c4274bfc5..d7973ca59 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdate.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdate.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Update; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java index c00635678..7bc4d26d4 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUpdateManyToOne.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java index 95cfce6d1..0caabf977 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsert.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TUuidEntity; diff --git a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java index 1c554e093..1642b2821 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/basic/TestUuidInsertMasterDetail.java @@ -1,6 +1,6 @@ package org.tests.basic; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java index 99197ac98..cb4ad2fd3 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteByIdList.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java index 17af48c3c..706b80b9f 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeById.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java index 5a101c208..ee5a5f8a5 100644 --- a/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java +++ b/ebean-test/src/test/java/org/tests/basic/delete/TestDeleteCascadeByQuery.java @@ -1,6 +1,6 @@ package org.tests.basic.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java index ea2e2de5c..9998c1669 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java @@ -1,10 +1,10 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java index 6c26ee0fe..e5a5f5875 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptBinary.java @@ -1,6 +1,6 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java index ff941438b..c67514cc5 100644 --- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java +++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncryptClientSide.java @@ -1,6 +1,6 @@ package org.tests.basic.encrypt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicEncryptClient; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index 8b86b1f87..e1dc3ffb7 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -1,7 +1,7 @@ package org.tests.basic.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TWithPreInsert; diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java index f6050a161..3a5985092 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestQueryAdapter.java @@ -1,6 +1,6 @@ package org.tests.basic.event; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryType; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java index 9068b760a..ee0fe55bd 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobFetchEager.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java index 5a2274e49..49f12151d 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestBasicClobNoVer.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java index 092924ed1..06f61ec10 100644 --- a/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java +++ b/ebean-test/src/test/java/org/tests/basic/lob/TestByteOnly.java @@ -1,6 +1,6 @@ package org.tests.basic.lob; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TBytesOnly; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java index ab4f0c4ba..54b5f1b7c 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOne2OneBookingInvoice.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java index 2ec4a3d96..59fdff226 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/TestOneToOneWheelTire.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java index 0ebacbde6..040b48bca 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestEnumValueAnnotation.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index d5ee6435a..ff8806b25 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESomeType; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java index 5229806e5..53eb722b3 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestQueryBooleanProperty.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java index 1578462a2..fb175a714 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestSqlRowUUID.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlQuery; import io.ebean.SqlRow; diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java index 7ee4ca9a9..fb38d7b45 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestTransientMap.java @@ -1,6 +1,6 @@ package org.tests.basic.type; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index 7c100ec0b..0ba734092 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,7 +1,8 @@ package org.tests.batchinsert; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java index b8c041f5b..03102a19c 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertSimple.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java index a4da626c3..e0aa7c908 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertWithInitialisedCollection.java @@ -1,6 +1,6 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index cc41e4933..c639cd563 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebeaninternal.api.SpiTransaction; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java index 7495f8560..52cc783b8 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchSaveWithGetBeanId.java @@ -1,9 +1,9 @@ package org.tests.batchinsert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java index dfca84655..9c1787dd4 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicLazy.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java index f017ae3ee..20ae99766 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBasicNavOnEmpty.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java index 879fb1097..64028f220 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithCacheHits.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index dbb650815..5648911aa 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java index 69033d33c..0fb8417d1 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBeanState.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java index c2b797bb7..abc40f017 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestEmptyManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java index 8dd286907..c607988a2 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java index 79a1daaf7..081255343 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyJoin2.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 6766cfe9a..5783e0fb9 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 0eabc9570..28001fb8a 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java index deae22962..5c0c2d2d3 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryDisableLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java index 64a88e1f1..219dc18e2 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoin.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java index 03386f656..3a4eeb675 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestQueryJoinToAssocOne.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java index ac0127398..f6b1c3eae 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestSecondQueryNoRows.java @@ -1,6 +1,6 @@ package org.tests.batchload; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java index f36936807..16c38fa30 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java index 059fd9a6d..15b25cd85 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheAsync.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.DatabaseFactory; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java index 617737c52..b0ec1decd 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheContactLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java index 069287b91..965e6eddd 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCacheWithDeleteQuery.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java index c7a45d5e6..e00da156b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanFetchJoinCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchGroup; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java index 59e54d538..3bc534c66 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheBasic.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java index 4f22cff59..fd6696f4b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCollectionIds.java @@ -3,6 +3,7 @@ package org.tests.cache; import io.ebean.*; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.server.cache.CachedManyIds; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java index 829d07279..fd0ed06aa 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheCustomer.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java index 02c220f3b..5a6d0c59a 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheDelete.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedBean; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java index ce511ea58..ddb3d6fde 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheEmbeddedId.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java index a71f52130..b69276295 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheInterceptSaveWhenLazyLoaded.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java index 225a7ac38..9a95f93a3 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheManyToOne.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.OCachedInhChildA; diff --git a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java index 1da96116a..faf7cbe01 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java +++ b/ebean-test/src/test/java/org/tests/cache/TestCacheNaturalId.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java index a6a52c38b..7607795a9 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java +++ b/ebean-test/src/test/java/org/tests/cache/TestExternalNotification.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java index 0655ae4c4..7cd366356 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2CacheWithSharedBean.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java index c65383dc0..866a801df 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/cache/TestL2DirtyFlagOnLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java index fdeb6f30d..ff0dfe4de 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestM2MCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.cache.M2MCacheChild; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index 5a5b06fc0..7b0949b42 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.ExpressionList; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java index bafb239eb..34f51511b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheCountry.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheManager; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java index 292a361af..a8b51f43b 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheInsert.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java index 8f08e776c..c5296a413 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheReadOnly.java @@ -1,6 +1,7 @@ package org.tests.cache; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java index 2fce790b7..e08d10209 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCacheTableDependency.java @@ -1,6 +1,6 @@ package org.tests.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java index 3434c48eb..85d69f8df 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/TestStringIdOnly.java @@ -1,6 +1,6 @@ package org.tests.cache.personinfo; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java index 6ead0106b..e9913ea4b 100644 --- a/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java +++ b/ebean-test/src/test/java/org/tests/callable/TestMysqlCallable.java @@ -1,6 +1,6 @@ package org.tests.callable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CallableSql; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java index 5468657b0..318534d3c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestCascadeOrphanStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java index 324774d01..2f9f62b26 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestDeleteO2MOrphans.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java index c1eca9d9b..0bd494f19 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMasterDetailDelete.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java index 94cc8b6f7..79a6cbc32 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestMultiCascadeBatch.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java index 1fecd07d9..3f6cab760 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOnlyKillOrphans.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java index f567928e3..c88f318e5 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestOrderedList.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java index 66f14e982..e7ac4868c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwned.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java index 376389835..986e28b1f 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedAddRemoveOrphan.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java index ebc6fe9bc..020cf066c 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedCascadeOrder.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index f265bf341..e1d5f19df 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java index 02b03ad73..34e3a330b 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLog.java @@ -2,7 +2,7 @@ package org.tests.changelog; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.annotation.ChangeLog; diff --git a/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java index 48d855918..b4c6a823d 100644 --- a/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java +++ b/ebean-test/src/test/java/org/tests/changelog/TestChangeLogInt.java @@ -1,6 +1,6 @@ package org.tests.changelog; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicChangeLog; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java index eeb66a5e4..b6507998d 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyDelete.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java index 4545424d2..6de92d46d 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyIdInExpression.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java index 26db614db..d2f208296 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCKeyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java index bcaf57f4a..bdf3e673c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCaoCompositeKeyWithAnnotationOverrides.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.compositekeys.db.CaoBean; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java index 6004c8762..35192da76 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestCore.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index fe904adfb..0df82645c 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -1,6 +1,6 @@ package org.tests.compositekeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CountDistinctOrder; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java index 9a90095bf..69cf085ec 100644 --- a/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java +++ b/ebean-test/src/test/java/org/tests/contructor/TestProtectedConstructor.java @@ -1,6 +1,6 @@ package org.tests.contructor; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Database; diff --git a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java index 8986ba8e8..ef3c8d600 100644 --- a/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java +++ b/ebean-test/src/test/java/org/tests/ddl/TestForeignKeyModes.java @@ -1,8 +1,8 @@ package org.tests.ddl; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java index 9822a68ff..d0efdec30 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/TestDefaults.java @@ -1,6 +1,6 @@ package org.tests.defaultvalues; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java index dc563f1a2..45293bc52 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdUsingModel.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.onetoone.Account; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java index d773c010e..7015923b3 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByIdWithPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java index 7d01a60d8..51f172493 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteByQuery.java @@ -1,7 +1,8 @@ package org.tests.delete; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java index 1b24ee419..6412c63f6 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteCascadeWithListener.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java index ff6dd9c33..f5831c1f0 100644 --- a/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java +++ b/ebean-test/src/test/java/org/tests/delete/TestDeleteWithoutOptimisticLocking.java @@ -1,6 +1,6 @@ package org.tests.delete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java index ecea5c295..1dc65930a 100644 --- a/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java +++ b/ebean-test/src/test/java/org/tests/docstore/CustomerReportTest.java @@ -1,7 +1,7 @@ package org.tests.docstore; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.text.json.JsonReadOptions; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index f21d12225..def5d2374 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -1,6 +1,6 @@ package org.tests.draftable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/el/TestELBasic.java b/ebean-test/src/test/java/org/tests/el/TestELBasic.java index 9fd4d619b..8743e7e4d 100644 --- a/ebean-test/src/test/java/org/tests/el/TestELBasic.java +++ b/ebean-test/src/test/java/org/tests/el/TestELBasic.java @@ -1,6 +1,6 @@ package org.tests.el; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.*; diff --git a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java index 2646707e6..1f06b3759 100644 --- a/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java +++ b/ebean-test/src/test/java/org/tests/el/TestUnderscoreParam.java @@ -1,6 +1,6 @@ package org.tests.el; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java index 1360c1cb6..ead52dbe0 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorManyAddAll.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; import org.tests.model.basic.MUser; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java index ac4adb358..fc3bca361 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestConstructorPutfieldReplacement.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java index 515d45e73..61fa85168 100644 --- a/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java +++ b/ebean-test/src/test/java/org/tests/enhancement/TestEnhancementEquals.java @@ -1,6 +1,6 @@ package org.tests.enhancement; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Product; diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java index 01d89b277..5a269dec8 100644 --- a/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java +++ b/ebean-test/src/test/java/org/tests/expression/bitwise/TestBitwiseExpressions.java @@ -1,6 +1,6 @@ package org.tests.expression.bitwise; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/family/TestInheritance.java b/ebean-test/src/test/java/org/tests/family/TestInheritance.java index 485428b79..58e3d81a3 100644 --- a/ebean-test/src/test/java/org/tests/family/TestInheritance.java +++ b/ebean-test/src/test/java/org/tests/family/TestInheritance.java @@ -1,8 +1,8 @@ package org.tests.family; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.deploy.BeanProperty; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java index c44fea1fa..ced209f8b 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -1,6 +1,6 @@ package org.tests.generated; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.EGenProps; diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java index 53ba7cb1b..53c8c6a6f 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedWho.java @@ -1,6 +1,6 @@ package org.tests.generated; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.xtest.base.MyCurrentUserProvider; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java index 5f2b96fb3..c74cc749a 100644 --- a/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java +++ b/ebean-test/src/test/java/org/tests/genkey/TestSeqBatch.java @@ -1,6 +1,6 @@ package org.tests.genkey; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.server.deploy.BeanDescriptor; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java index 5039ad72e..b4c50cecf 100644 --- a/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java +++ b/ebean-test/src/test/java/org/tests/history/TestHistoryInsert.java @@ -1,7 +1,8 @@ package org.tests.history; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java index 4ad721274..2abfd3e9a 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestCustomId.java @@ -1,7 +1,7 @@ package org.tests.idkeys; import io.avaje.moduuid.ModUUID; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ECustomId; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index 8f57569a0..470469d41 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -1,8 +1,8 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Transaction; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.config.dbplatform.IdType; import io.ebeaninternal.api.SpiEbeanServer; @@ -26,7 +26,7 @@ public class TestGeneratedKeys extends BaseTestCase { @ForPlatform(Platform.H2) // readSequenceValue is H2 specific public void testGenKeySeqA() throws SQLException { assumeTrue(idType() == IdType.SEQUENCE); - + SpiEbeanServer server = spiEbeanServer(); try (Transaction tx = server.beginTransaction()) { @@ -46,7 +46,7 @@ public class TestGeneratedKeys extends BaseTestCase { } } - + @Test @ForPlatform(Platform.H2) // readSequenceValue is H2 specific public void testGenKeySeqB() throws SQLException { @@ -89,7 +89,7 @@ public class TestGeneratedKeys extends BaseTestCase { case MARIADB : throw new UnsupportedOperationException("reading sequence value outside of the current connection is not supported. " + "See https://mariadb.com/kb/en/previous-value-for-sequence_name/#description"); - + default : throw new UnsupportedOperationException("reading sequence value from " + spiEbeanServer().databasePlatform().getPlatform() @@ -126,7 +126,7 @@ public class TestGeneratedKeys extends BaseTestCase { assertNotNull(al.getId()); } } - + @Test @ForPlatform({Platform.H2, Platform.MARIADB, Platform.SQLSERVER, Platform.DB2}) public void testGeneratedKeys() throws SQLException { diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java index e6b2fbad8..f8504d26d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.TOne; diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java index 6627cd81f..b869f9cf9 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestSimpleIdInsert.java @@ -1,6 +1,6 @@ package org.tests.idkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java index 5a5036721..b4567c25e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestDuplicateKeyException.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.AttributeHolder; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java index 6dbe29216..e393235c0 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritInsert.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java index a0875a694..bb3323cf3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceDiscriminatorQueryCache.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java index deb32300f..ad6517297 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceJoins.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java index 1be175266..8ccc74fb5 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOnMany.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.common.BeanList; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java index 57e36f9f6..295180236 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceOrderColumn.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java index dec3ecb53..82e3116f9 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceQuery.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java index 6cbb1945f..5deb85db5 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRawSql.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java index a041117ac..9716392d3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestInheritanceRefBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java index a67d6a764..dcb546a90 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestIntInherit.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TIntChild; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java index e365002fc..41911e06b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestNpeOnDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java index 3f9f870ed..3a8ffef16 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestSkippable.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java index b9391055c..d042bb01c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/TestTreeOrganisations.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java index 8e9e2a6aa..8c6d61d80 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/TestInheritanceNum.java @@ -1,6 +1,6 @@ package org.tests.inheritance.abstrakt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java index 40c75b695..80a8910a7 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TestInheritanceBothSides.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java index aea64c388..7cee2dab1 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceCache.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.cache.CInhOne; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java index d341db918..569141191 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/TestInheritanceRefCache.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java index b11abf5ed..2ede7296e 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/TestInheritanceDeleteCascade.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java index 5f0a31039..176748edc 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java index 773bffb02..4160b9bc5 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCollection.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java index 1794098e6..35f0bf271 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDataIntegrityException.java @@ -1,9 +1,9 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DataIntegrityException; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java index 8682874dc..4ffa8f8e9 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertDuplicateKey.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java index 436f2e6b4..9704b2045 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertOnStringKey.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.orderentity.OrderEntity; diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java index e2c1b9ebc..148931fad 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertWithIdAndUuid.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java index b33391c5b..3dd1e128e 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/TestOnlyIdEntity.java @@ -1,9 +1,9 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java index 6407aa046..cbd4f1f26 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java +++ b/ebean-test/src/test/java/org/tests/insert/TestSaveWithDaylightSavings.java @@ -1,6 +1,6 @@ package org.tests.insert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.sql.SQLException; diff --git a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java index 51b1fe382..b90c9cc57 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java +++ b/ebean-test/src/test/java/org/tests/iud/TestCarWheelIud.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java index b86cc5e5c..4ad61cff3 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInfoOneToOne.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.info.InfoCompany; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java index 3741a2d55..b4df0d011 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertQueryUpdate.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java index 48e72585b..4b45d4a3c 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java +++ b/ebean-test/src/test/java/org/tests/iud/TestInsertUpdateTrans.java @@ -1,6 +1,6 @@ package org.tests.iud; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java index 6aeaa4a37..cc9c9b5e9 100644 --- a/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/iud/TestPersistCascade.java @@ -1,7 +1,7 @@ package org.tests.iud; import io.avaje.moduuid.ModUUID; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java index 25302f8e1..47fbfdc58 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -1,7 +1,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java index 52a176dd3..ca067d1b0 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson2.java @@ -1,7 +1,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonJackson2; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java index ff9c3216c..b5a540838 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson3.java @@ -1,10 +1,10 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.ValuePair; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index ce84f08b3..27434601e 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -1,8 +1,8 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.TextException; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java index 39971b716..bb1b87602 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBasic.java @@ -1,9 +1,9 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import io.ebean.text.json.EJson; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java index d73f27625..431a80c70 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapBlob.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java index c87ad37f4..102c661d1 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapClob.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java index 66e28b5f9..782fc90da 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapJsonB.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java index 551040e72..82d5acee9 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonMapVarchar.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java index 77bdfbb1c..bd289c7fc 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBasic.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java index 0e349ff26..0e697054b 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeBlob.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeBlob; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java index f863981f6..ea3b19816 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeJsonb.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeJsonB; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java index c2de2026a..c4a225f8d 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNodeVarchar.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonNodeVarchar; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java index 593e19080..bdc27c210 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonNullValues.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicOldValue; diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java index 9a2d5d6ca..201c00220 100644 --- a/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java +++ b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java @@ -3,7 +3,7 @@ package org.tests.json; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.ValuePair; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.MutationDetection; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; diff --git a/ebean-test/src/test/java/org/tests/json/TestOldValue.java b/ebean-test/src/test/java/org/tests/json/TestOldValue.java index 63a7cda22..476793d04 100644 --- a/ebean-test/src/test/java/org/tests/json/TestOldValue.java +++ b/ebean-test/src/test/java/org/tests/json/TestOldValue.java @@ -2,7 +2,7 @@ package org.tests.json; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ValuePair; import org.assertj.core.api.SoftAssertions; diff --git a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java index 4ab61389b..e9eea9c1c 100644 --- a/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java +++ b/ebean-test/src/test/java/org/tests/json/TestUnmappedProperties.java @@ -1,6 +1,6 @@ package org.tests.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonUnmapped; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 7fb3fcc05..f88f14829 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -1,6 +1,6 @@ package org.tests.lazyforeignkeys; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; @@ -87,7 +87,7 @@ public class TestLazyForeignKeys extends BaseTestCase { assertFalse(rel1.getEntity1().isDeleted()); assertTrue(rel1.getEntity2().isDeleted()); } - + @Test public void testGetWithDbForeignKey() { MainEntityRelation relation = DB.find(MainEntityRelation.class).findOne(); @@ -95,9 +95,9 @@ public class TestLazyForeignKeys extends BaseTestCase { cat.setId(123L); relation.setCat(cat); DB.save(relation); - + relation = DB.find(MainEntityRelation.class).findOne(); - + assertNotNull(relation.getCat()); } } diff --git a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java index 73675df63..5973dcf7d 100644 --- a/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java +++ b/ebean-test/src/test/java/org/tests/level/test/ManyToManyTest.java @@ -1,6 +1,6 @@ package org.tests.level.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.level.Level1; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java index 9700a1229..8fba76f4b 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleAnnotatedBean.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 48efd17ec..07491fa1f 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithLifecycleExceptions; diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java index 67841cff6..adbac28c2 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleWithLog.java @@ -1,6 +1,6 @@ package org.tests.lifecycle; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicLog; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java index 12f2f9806..4a1b8653b 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteCascadeFromParent.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java index 415f56c97..a90ce7ea0 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteNoCascade.java @@ -1,9 +1,9 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java index b60af0b06..462e9b8c4 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteObjectWithCascadeToM2m.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.Permission; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java index 6d996c61c..be65dcc09 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java index cf10512cd..327aa8e87 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MDistinct_sqlServer.java @@ -1,8 +1,8 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java index 7089bedca..dc31662ab 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MModifyTest.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java index 425ae3812..afbc2440f 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MMultipleLists.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MailBox; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java index 0cd6ca95d..2cee8aeba 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2MSelfRelationship.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.m2m.MnyTopic; diff --git a/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java index c7b3d1f5b..8afd1e5cd 100644 --- a/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java +++ b/ebean-test/src/test/java/org/tests/m2m/TestM2mDeleteObject.java @@ -1,6 +1,6 @@ package org.tests.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.meta.MetaTimedMetric; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java index c8fe1498b..7f681b81b 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/TestM2MSoftDeleteExists.java @@ -1,6 +1,6 @@ package org.tests.m2m.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java index 5ab159089..d52266cb3 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeBasic.java @@ -1,6 +1,6 @@ package org.tests.merge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java index 43928257d..51de98fa5 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeCustomer.java @@ -3,6 +3,7 @@ package org.tests.merge; import io.ebean.*; import io.ebean.test.LoggedSql; import io.ebean.text.PathProperties; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java index 4974bfae1..5e0cfc1fa 100644 --- a/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java +++ b/ebean-test/src/test/java/org/tests/merge/TestMergeM2M.java @@ -1,6 +1,6 @@ package org.tests.merge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.MergeOptions; import io.ebean.MergeOptionsBuilder; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java index 9660d7530..dda574872 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationMany.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java index d8c7fea17..da8b1ffd8 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/TestAggregationTopLevel.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java index 8a2cb9911..63856d085 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_asSet.java @@ -1,9 +1,9 @@ package org.tests.model.array; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java index 7352a5bd5..8d413c34c 100644 --- a/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java +++ b/ebean-test/src/test/java/org/tests/model/array/TestDbArray_basic.java @@ -1,8 +1,9 @@ package org.tests.model.array; import io.ebean.*; -import io.ebean.annotation.ForPlatform; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java index 5bfaa970d..b3fa88307 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java index 3f2090dd0..6a97a95ea 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Pairs; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java index 0f4a902c3..c3848ca5a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheWithSoftDelete.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCache; import io.ebean.cache.ServerCacheStatistics; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java index ac34b2fce..46541c223 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWhenNull.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java index 674b060c4..6e73f72c4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyCacheWithForeignKey.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java index ba6a16ac2..9ebba0d92 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/TestNatKeyUid.java @@ -1,6 +1,6 @@ package org.tests.model.basic.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.cache.ServerCacheStatistics; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java index 8a4b17d12..47847b9db 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/TestFirstSecond.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java index 7dff5caf5..798148684 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/TestMapSuperEquals.java @@ -1,6 +1,6 @@ package org.tests.model.basic.mapsuper; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.bean.EntityBean; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java index 6b553e01a..1734be563 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestDeleteUnloadedChildren.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java index 9b9b13028..23a8020cc 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenFlushThenUpdate.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java index ba3a75ffb..f757beedf 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchThenUpdate.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java index 5f1e23178..3b7a18da9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/TestInsertBatchWithDifferentRootTypes.java @@ -1,9 +1,9 @@ package org.tests.model.basic.xtra; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java index 201339bdc..4c2d594c7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestExplicitM2MBridgeTable.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java index 2cedcc84d..fe9eebfb3 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/TestIdClassScalar.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java index 772d12c5b..faec8244e 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestInheritSoftDeleteJoin.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java index 9f6052b9a..3032ff45f 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestMTOInheritNoDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java index 18ed6d523..9803ed934 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TestTruckCarWheelInhertiance.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java index 57b3bf6d8..d2e67f631 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/TestCompositeKeyUserClient.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java index b3b505068..a296baabf 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPersonTest.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java index 44bd1d576..7c624dfcd 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPersonTest.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java index 6524d0e7f..590d0d796 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasic.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java index 3fa8ac694..36c45e538 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java index 366ad5570..0bf01e2e2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMap.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java index af02d2a26..f37b231c3 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapAsLob.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java index fef7fb95e..0516f19f8 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicMapCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.PersistBatch; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java index 65359a683..36bb4c28f 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionBasicSet.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java index 7d949d94a..d3904838a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascade.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java index 0278dd465..003c721a4 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionCascadeMultiple.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java index 1c19069c6..508c84156 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedList.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java index 6b5c62b3b..9aef4c029 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java index ea6d47d90..44fa51e7b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedListCache2.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java index 18912a254..0c9ab75a0 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMap.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java index 3c1802e78..96fa04c78 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEmbeddedMapCache.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java index e60921867..27d856347 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionEnumSet.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java index 2c55ceae4..057f5283a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/TestElementCollectionResused.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java index fe1c32cb4..a0360cb23 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedAttrOverride.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java index 52462c880..19362dffb 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedManyToOne.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.Property; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java index f6f636c1e..390678212 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/TestEmbeddedNullableOverride.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java index 029100f3e..45070451d 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryEmbeddedId.java @@ -1,10 +1,10 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ValuePair; import io.ebean.Version; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java index 64a5c54a8..9107beae3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryExclude.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java index f1122447b..5e305f5d4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryInclude.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java index b5c0c43d4..7278d8cf4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistoryOneToMany.java @@ -1,8 +1,8 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java index 6ac425f71..9456ef49e 100644 --- a/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/TestHistorySoftDeleteOneToOne.java @@ -1,6 +1,6 @@ package org.tests.model.history; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java index 395f99a13..8364ccc16 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/test/TestInheritExposeDtype.java @@ -1,6 +1,6 @@ package org.tests.model.inheritexposedtype.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.inheritexposedtype.IXPhoto; diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java index 181d9af22..02ba0dc68 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/TestMediaInheritanceJoinToMany.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java index ec164715d..1d2415ca4 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/TestSelfMany.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java index 974d7aeef..aa7030ef1 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/TestTargetEntity.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java index 57a4d97ad..8ab723908 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/test/TestAttributeConverter.java @@ -1,6 +1,6 @@ package org.tests.model.ivo.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.ivo.ESomeConvertType; diff --git a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java index 127eb6162..ae3598aac 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/model/joda/TestJodaInsertUpdate.java @@ -1,6 +1,6 @@ package org.tests.model.joda; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.joda.time.DateTime; import org.joda.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java index e84d82dc3..b0927c7ba 100644 --- a/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java +++ b/ebean-test/src/test/java/org/tests/model/json/TestJacksonPlainBean.java @@ -1,6 +1,6 @@ package org.tests.model.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java index 39ac73ded..70aa27e7a 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/TestWithCacheAndLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithcache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java index 6c1f8ea58..9f4fb068a 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/TestColumnIdName.java @@ -1,6 +1,6 @@ package org.tests.model.lazywithid; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index a6449bbca..d9ac37ffc 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.AfterEach; diff --git a/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java index 269e9dd57..94702038f 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/TestManyToOneAsOne.java @@ -1,8 +1,8 @@ package org.tests.model.m2o; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index f93459556..aeda58f12 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -1,6 +1,6 @@ package org.tests.model.nofk; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index a13b0cdff..66f85692c 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -1,6 +1,6 @@ package org.tests.model.nofk; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java index bc4b7c94a..dbd1d01ae 100644 --- a/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java +++ b/ebean-test/src/test/java/org/tests/model/noid/TestInsertNoIdBean.java @@ -1,6 +1,6 @@ package org.tests.model.noid; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java index 088d98c9d..01c31249c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneCascadeSave.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 8d7d33e66..122e298e9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java index 70db66096..98914f2af 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneJoinColumn.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java index 15d390821..3db11f94e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOptionalRelationship.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java index a15ba6a15..780564b83 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanRemove.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java index 14051b5e4..698a17dc7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneOrphanStringId.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java index 6662c5033..2a90c5670 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoin.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index b010f5b4b..81e8905ed 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 0ea4c16d1..39cbfa730 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java index d19da3abc..6f5d648a0 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneSoftDeleteChild.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java index c4612e613..6da1a4ecd 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/DeleteById_SoftDelete_Tests.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone.album; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java index 98c4acbe7..b408d4dc9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/TestOneToOneHardDelete.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone.album; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java index d888f0c62..8712ce8f3 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2M.java @@ -1,6 +1,6 @@ package org.tests.model.orphanremoval; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java index cce4380c9..57a06789e 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/TestOrphanRemoveO2MFlat.java @@ -1,6 +1,6 @@ package org.tests.model.orphanremoval; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java index 0ad676aa6..f2b903e38 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/TestPrinterStateIssue.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/pview/TestPview.java b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java index 72d885173..0bddc3e79 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/TestPview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/TestPview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java index e7c3d42e5..a384a3794 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestResourceFileSelfRef.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index f99d5d6de..256fe5634 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java index 5715204c5..6ca62e534 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestTextJsonSelfRef.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java index b133061c6..9dc6df3e2 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java +++ b/ebean-test/src/test/java/org/tests/model/site/TestTreeModel.java @@ -1,6 +1,6 @@ package org.tests.model.site; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java index ec3cbba19..cdb3b7b23 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java +++ b/ebean-test/src/test/java/org/tests/model/survey/TestOrderByFetch.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java index 4b74ceb75..cd7116a56 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TestAssocOneNullTraverse.java @@ -1,6 +1,6 @@ package org.tests.model.tevent; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java index b318e643f..51d00ca8c 100644 --- a/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java +++ b/ebean-test/src/test/java/org/tests/model/version/TestVersionHierarchyModification.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java index 5f91694b1..d57ce95b9 100644 --- a/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java +++ b/ebean-test/src/test/java/org/tests/model/view/TestViewBaseEntity.java @@ -1,6 +1,6 @@ package org.tests.model.view; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java index 71a87432b..c5a25fe35 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/TestWithZero.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java index be1936e6a..3c708d8d1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyEnhancement.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.common.BeanList; import org.junit.jupiter.api.Test; import org.tests.model.json.EBasicJsonMap; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java index 47e2eff50..fc6b2f613 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyNoMappedBy.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java index c1d7b40b6..91031a3d6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyOnlyBean.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.EntityBean; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java index 77d85654b..aac83b7b2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java +++ b/ebean-test/src/test/java/org/tests/o2m/TestOneToManyWhere.java @@ -1,6 +1,6 @@ package org.tests.o2m; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java index 0d035fbd5..5c295e5ea 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTable.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java index 9413f6cfd..818bf8b85 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableInheritance.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.config.dbplatform.IdType; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java index ee58d1964..792d58e2b 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/TestOneToManyJoinTableNoTableName.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java index e94d21fa9..dd675a67e 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/TestLazyManyViaPath.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java index aa4971107..f858739db 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextOnUpdateDuringTxn.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java index 235976ee4..56988bc4b 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextQueryScope.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java index 81aed21f8..3ea926b29 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextScopeUsingOrders.java @@ -1,6 +1,6 @@ package org.tests.persistencecontext; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java index 67fc1d549..b066c01a2 100644 --- a/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java +++ b/ebean-test/src/test/java/org/tests/persistencecontext/TestPersistenceContextServerConfig.java @@ -3,6 +3,7 @@ package org.tests.persistencecontext; import io.ebean.*; import io.ebean.config.ContainerConfig; import io.ebean.config.DatabaseConfig; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java index c3c5fb7c0..23ca117d1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java +++ b/ebean-test/src/test/java/org/tests/query/TestAddOrderByWithFirstRowsMaxRows.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java index 52a3dd791..7b1307c6f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestAutofetchTuneWithJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.ObjectGraphNode; diff --git a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java index d12e052ff..e009b8866 100644 --- a/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java +++ b/ebean-test/src/test/java/org/tests/query/TestConnectionCloseOnSqlerr.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java index 0328af33f..0fefc767c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java +++ b/ebean-test/src/test/java/org/tests/query/TestDefaultFetchLazy.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java index ec5e64686..aa8830f25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java +++ b/ebean-test/src/test/java/org/tests/query/TestExprNestedDisjunction.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java index a03386c2e..777c503ff 100644 --- a/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java +++ b/ebean-test/src/test/java/org/tests/query/TestFindOneOrEmpty.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestIContains.java b/ebean-test/src/test/java/org/tests/query/TestIContains.java index c014aace4..d7fdf6634 100644 --- a/ebean-test/src/test/java/org/tests/query/TestIContains.java +++ b/ebean-test/src/test/java/org/tests/query/TestIContains.java @@ -2,6 +2,7 @@ package org.tests.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java index 402b6dc99..59f198f78 100644 --- a/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java +++ b/ebean-test/src/test/java/org/tests/query/TestImplicitJoinOnParentRelationship.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java index fd96088ba..2557d1782 100644 --- a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java index 2991df135..ba2939160 100644 --- a/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/ebean-test/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java index 80d7d6c0d..d2979f723 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitAlterFetchMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java index 52442979c..fd897f99b 100644 --- a/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestLimitQuery.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java index b2b38c42e..3cacc5208 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java index 3d6eb76cb..4d0ef4c24 100644 --- a/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestManyWhereJoinM2M.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java index 0b51c347d..40959a361 100644 --- a/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java +++ b/ebean-test/src/test/java/org/tests/query/TestMyAdHocSqlSelect.java @@ -1,6 +1,7 @@ package org.tests.query; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.MyAdHoc; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java index 50723dc9b..701286b7f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java +++ b/ebean-test/src/test/java/org/tests/query/TestOneToManyCorrectGrouping.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java index d1834ddc0..f75b426bc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestOuterJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java index e9470dbd8..42ffbe458 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java @@ -1,9 +1,9 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.CKeyParent; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java index 2f5a32b28..7ddb1e1c2 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryBaseTable.java @@ -1,8 +1,8 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java index 58fc9f412..6dcbd34bd 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryExists.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryExists.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java index bec162c9a..7df6843c7 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchJoinWithOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java index aa1592787..3a861a271 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchManyTwoDeep.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java index cf840ba25..b45003fa1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFetchSkipPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java index c7ac0311f..1cc3a7f52 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java index 0d8830797..ebc02064d 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java index f47d9da52..55690536e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MUser; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java index de9b567df..91b88453e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnSecondary.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java index 7864838ff..c9af3e2ce 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFilterManySimple.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java index 9dce80a77..95bebbe25 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEach.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java index d444d54e0..416da9611 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindEachWhile.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java index 2a05cb16d..01b9a0e76 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindFutureList.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FutureList; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index fa884feb2..59307d83c 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -1,10 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.QueryIterator; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.datasource.DataSourcePool; import io.ebean.plugin.SpiServer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java index e1e091f15..d2aefb407 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindMapTypedKey.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java index b3c229f71..58b49c22e 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindNative.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.FetchConfig; import io.ebean.PagedList; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 580f821dc..73ccb1c33 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.PagedList; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java index 78be3b140..6a08a74ef 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindReadOnly.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java index 63a6c5c8f..b53276d40 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java index 77a3088cc..e30859f24 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInAssocOne.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java index 72a6d98a5..7e30448e0 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryInIdTypeConversion.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java index f93a9e450..faf97ab53 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryIsNull.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java index fa478dd20..d1de92e43 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinBatchSize.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java index 171df676f..bdbddebea 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryJoinMulipleMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java index 4f439a58e..90868a9da 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiJoinFetchPath.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java index a67aaec76..3b433de83 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryMultiManyOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java index c48c11f87..1fde35127 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryNullAssocOne.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java index 579c1dfd0..5f3ace76a 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryOrderById.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java index 1d41c026e..b7910ee4f 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPathJoinAndOrder.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java index fb1fac598..16feef8be 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryPlanCacheRowCount.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java index 5b0e4c931..0739c2801 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java +++ b/ebean-test/src/test/java/org/tests/query/TestRefToLazyLoadMany.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Contact; diff --git a/ebean-test/src/test/java/org/tests/query/TestRowCount.java b/ebean-test/src/test/java/org/tests/query/TestRowCount.java index 0d3f215c8..627b9e883 100644 --- a/ebean-test/src/test/java/org/tests/query/TestRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/TestRowCount.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java index 1f868508b..a63c91115 100644 --- a/ebean-test/src/test/java/org/tests/query/TestSubQuery.java +++ b/ebean-test/src/test/java/org/tests/query/TestSubQuery.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java index 8b2ed0939..3a79e6bc1 100644 --- a/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java +++ b/ebean-test/src/test/java/org/tests/query/TestThreeLevelQueryJoin.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereIn.java b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java index f6c4162d4..727df61fc 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereIn.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereIn.java @@ -1,6 +1,6 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java index ebb5ce146..7c2b36603 100644 --- a/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java +++ b/ebean-test/src/test/java/org/tests/query/TestWhereRawClause.java @@ -1,10 +1,10 @@ package org.tests.query; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 09e9c5b1e..8636d48d6 100644 --- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -1,6 +1,6 @@ package org.tests.query.aggregation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java index 2595c5bfb..676beb2b7 100644 --- a/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java +++ b/ebean-test/src/test/java/org/tests/query/autotune/TestAutoTuneProfiling.java @@ -1,6 +1,6 @@ package org.tests.query.autotune; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java index 4dc9702fe..a84897d41 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/cache/TestDistinct.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index eb065149e..5bdc8b186 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -1,7 +1,8 @@ package org.tests.query.cancel; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java index 9b449cf4d..fd49fa5af 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestFilteringByEmbeddedInJoinedTable.java @@ -1,6 +1,6 @@ package org.tests.query.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ExpressionList; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java index 9291cde2e..1bdb21ab3 100644 --- a/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java +++ b/ebean-test/src/test/java/org/tests/query/embedded/TestMultipleEmbeddedLoading.java @@ -1,6 +1,6 @@ package org.tests.query.embedded; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.cache.ServerCache; diff --git a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java index 7903adb9c..8b0273424 100644 --- a/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java +++ b/ebean-test/src/test/java/org/tests/query/finder/TestCustomerFinder.java @@ -1,9 +1,9 @@ package org.tests.query.finder; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.meta.*; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java index 840b3b46f..4b1e18e03 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Expr; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java index b6b8d394d..beb554945 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterOnMany.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java index c67d875a1..9a50964bc 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinManyNonRoot.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index d790e99c9..81eb2cfc1 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java index 7d417f1ed..f09155462 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinQueryNonRoot.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java index 76e5952d0..1801c2dcf 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryManyToOneWhereClauseJoin.java @@ -1,6 +1,6 @@ package org.tests.query.joins; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java index ade9da0e7..65e00a180 100644 --- a/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/ebean-test/src/test/java/org/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -1,6 +1,6 @@ package org.tests.query.lazy; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.ProfileLocation; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java index 6d09bf18c..c0b7bfd7e 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByClear.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.OrderBy; import io.ebean.Query; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java index 1c223c3ce..f2ef12851 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByOnComplex.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java index 673aa0363..8e6d13893 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinct.java @@ -1,9 +1,9 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java index 66832db7e..8d559f67f 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java index b85867d7f..24e3664ea 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithFunction.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java index 9a399d344..028b80d2d 100644 --- a/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/orderby/TestOrderByWithMany.java @@ -1,6 +1,6 @@ package org.tests.query.orderby; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java index 37a09cb7a..5ca68c42e 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFetchPreference.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java index 9ca47f36c..b387006a1 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIdsWithInheritance.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Truck; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java index cc2a58594..aa34c2a95 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindIterateHeapDump.java @@ -1,7 +1,7 @@ package org.tests.query.other; import com.sun.management.HotSpotDiagnosticMXBean; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java index 7ea317f94..5dedb9955 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java index 1109e3043..c5d792e97 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestFormulaWithFindCount.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.ExpressionList; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java index c0f3deff8..cbbba65dd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyLazyLoadingQuery.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java index 052165d16..e53c1e891 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestManyToManyLazyLoading.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.MRole; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java index 71b49dc82..b1a53208c 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestOneToManyAsMap.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.map.MpRole; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java index ffd7c8527..b445073b8 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryConversationRowCount.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java index 5786658a2..5045186cd 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryDistinct.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java index 153e3c120..391ba4f50 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRawExpressionMany.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java index bca8d203a..1f689e123 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQueryRowCountWithMany.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index 69d6ffa59..df9d0f3b0 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -1,6 +1,7 @@ package org.tests.query.other; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java index 483b85998..9aa5c761a 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSelfParent.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.selfref.SelfParent; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java index c3eb3a2bd..0340e05ce 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestSubQueryBinding.java @@ -1,6 +1,7 @@ package org.tests.query.other; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java index 0f52d3dac..a3b587575 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereAnnotation.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java index e637d2411..b6603a2f2 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestWhereLikeWithSlash.java @@ -1,6 +1,6 @@ package org.tests.query.other; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java index 485a741c3..fd3768090 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/SqlQueryTests.java @@ -1,7 +1,8 @@ package org.tests.query.sqlquery; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaTimedMetric; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java index 66e9ce6bd..c201582c7 100644 --- a/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java +++ b/ebean-test/src/test/java/org/tests/query/sqlquery/TestNativeILikeExpression.java @@ -1,6 +1,6 @@ package org.tests.query.sqlquery; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.annotation.Platform; diff --git a/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java index f30d1ba60..abc91b65d 100644 --- a/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java +++ b/ebean-test/src/test/java/org/tests/quotedidentifier/TestQuotedIdentifierQuery.java @@ -1,6 +1,6 @@ package org.tests.quotedidentifier; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.BWithQIdent; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java index f4c4c26b7..cdfc0af5b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestInsertSqlLogging.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java index c6c541de7..624f5df6b 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestOrderReportTotal.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.OrderAggregate; import org.tests.model.basic.OrderDetail; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java index 9b9540003..03c03c5fd 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlAsKeyword.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java index d61d4c8e4..10f1b558a 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlCustomerAggregate.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.CustomerAggregate; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java index dcc81e2da..b749db38e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlMasterDetail.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java index e40fe30bd..17cf86356 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlNamedParams.java @@ -1,7 +1,8 @@ package org.tests.rawsql; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java index 154395bba..441100133 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQuery.java @@ -1,7 +1,8 @@ package org.tests.rawsql; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java index 9e834e98f..5bce462f1 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmQueryDistinct.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java index aa8048769..51c785250 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java index 8e477055c..d961ecf53 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; import org.tests.model.basic.OrderAggregate; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java index 404b12861..0658320be 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java index 6444593e6..c4af99d58 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlPositionedParams.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java index 61942668e..b3b04229d 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlUnparsedQuery.java @@ -1,6 +1,6 @@ package org.tests.rawsql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java index 59a2bfa81..88f2c2aaa 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java +++ b/ebean-test/src/test/java/org/tests/rawsql/TestRawSqlWithResultSet.java @@ -1,6 +1,7 @@ package org.tests.rawsql; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java index 5e45b8130..30b004bad 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentQueryTest.java @@ -1,6 +1,6 @@ package org.tests.rawsql.inherit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.inherit.ChildA; diff --git a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java index 0369ba346..cb8662d1e 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java +++ b/ebean-test/src/test/java/org/tests/rawsql/inherit/ParentRawSqlTest.java @@ -1,6 +1,6 @@ package org.tests.rawsql.inherit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.RawSql; import io.ebean.RawSqlBuilder; diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java index b34bfd55a..a86a07f21 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeSqlBasic.java @@ -1,10 +1,10 @@ package org.tests.rawsql.nativesql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.Query; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java index 991f66724..9b85e8cf2 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java +++ b/ebean-test/src/test/java/org/tests/rawsql/nativesql/TestNativeWithEmbedded.java @@ -1,6 +1,6 @@ package org.tests.rawsql.nativesql; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java index 2b1a2740d..3cf98812d 100644 --- a/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java +++ b/ebean-test/src/test/java/org/tests/readaudit/TestReadAudit.java @@ -1,6 +1,6 @@ package org.tests.readaudit; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.Database; import io.ebean.DatabaseFactory; import io.ebean.FutureList; diff --git a/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java index f09823412..633bf0483 100644 --- a/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java +++ b/ebean-test/src/test/java/org/tests/repository/TestBeanRepository.java @@ -1,6 +1,6 @@ package org.tests.repository; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; diff --git a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java index d7e9fc8ba..41ae6c338 100644 --- a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java +++ b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveAssociation.java @@ -1,6 +1,6 @@ package org.tests.saveassociation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java index 4229cbf65..a646e9e49 100644 --- a/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java +++ b/ebean-test/src/test/java/org/tests/saveassociation/TestSaveSamePK.java @@ -1,6 +1,6 @@ package org.tests.saveassociation; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TSDetail; diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java index 061475a40..6010d0bfb 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/TestInheritQuery.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.singleTableInheritance.model.*; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java index 8642a67aa..f3d5389a8 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBasic.java @@ -2,6 +2,7 @@ package org.tests.softdelete; import io.ebean.*; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.softdelete.EBasicNoSDChild; import org.tests.model.softdelete.EBasicSDChild; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java index 992ada21a..9f573f653 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteBook.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java index 45d44dd82..ccf74c663 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteManyToMany.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java index a3aee96d6..bada81f07 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOptionalRelationship.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Finder; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java index d150d9712..efff3fe5e 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteOtoCascade.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java index a8d548ebe..54b93195f 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java index c34b75ef8..6a8889fbf 100644 --- a/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java +++ b/ebean-test/src/test/java/org/tests/softdelete/TestSoftDeleteTop.java @@ -1,6 +1,6 @@ package org.tests.softdelete; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java index 17a211de7..80656a5e0 100644 --- a/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java +++ b/ebean-test/src/test/java/org/tests/sp/TestManyToManySaveTwice.java @@ -1,6 +1,6 @@ package org.tests.sp; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java index 7b510e858..02bd9d1d8 100644 --- a/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java +++ b/ebean-test/src/test/java/org/tests/test/TestInheritWithMany.java @@ -1,6 +1,6 @@ package org.tests.test; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java index 3aea61ade..5f05cab76 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestTimeStringParser.java @@ -1,6 +1,6 @@ package org.tests.text.csv; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.text.TimeStringParser; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index ddd05f05c..6edefc417 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -1,7 +1,7 @@ package org.tests.text.json; import com.fasterxml.jackson.core.JsonParser; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebeaninternal.api.SpiEbeanServer; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java index f07c31d65..a69fd5a3b 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanWithTimeZone.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java index 19ac15925..faac7e127 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonInheritanceDiscriminator.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java index c955939d5..c35068932 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonMap.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java index d0bf62f9c..c44957fc6 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.EJson; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java index 08f171196..7baba2633 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonSomeEnumWithToString.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java index 2d1d5df3a..00fa481cd 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java index 00dbae51a..cea12e239 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonCompoundType.java @@ -4,7 +4,7 @@ package org.tests.text.json; // //import org.junit.Assert; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; // diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 5c1f02cd3..6f2fc22f1 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java index 70feaf335..f799e7de9 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInsertUpdate.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.util.StringHelper; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java index bc7ff3251..e51bdeff8 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInvokeLazy.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java index c73264234..33ea392f1 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.PathProperties; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java index d140b46d7..7f1173216 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonReferenceBean.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import io.ebean.bean.EntityBean; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java index 3f4da80e7..754ffd87d 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.text.PathProperties; diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java index f0f41ba10..e0b026ded 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonSuperSimple.java @@ -1,6 +1,6 @@ package org.tests.text.json; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.text.json.JsonContext; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java index 639b52c69..7018883a8 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchModelFlush.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java index 7f575924a..3181d8456 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBatchPersistCascade.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.test.LoggedSql; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index 2fcb01543..cdcf7bbdc 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.test.LoggedSql; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index 2e0d05ef9..74e480340 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.TxIsolation; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java index e8197fc33..ea532fbd2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestCommitAndContinue.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java index aff263bbd..4c9cdc21c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestCreateTransactionWithIsolation.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; public class TestCreateTransactionWithIsolation extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java index a4b4ee099..936babbd2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestDeleteFromPersistenceContext.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java index be3b6557b..2b95e9d6f 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestExecuteComplete.java @@ -1,7 +1,8 @@ package org.tests.transaction; import io.ebean.*; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java index ecab276e9..632fbdb77 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestInsertManyAndRef.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.BBookmark; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java index 1993c90be..c34688083 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNested.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java index 58b4c68c5..03a08863a 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequired.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java index 6f91cf2fd..ffe5ff162 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiredWithFailure.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java index ca6b62bc7..b71e1fee3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNew.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java index 927d3380a..776ad72b9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedBeginRequiresNewWithFailure.java @@ -1,6 +1,7 @@ package org.tests.transaction; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java index a1409cd32..7d1d3acd7 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java index 44e8f7299..e8f32eced 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedSubTransaction.java @@ -1,7 +1,8 @@ package org.tests.transaction; import io.ebean.*; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java index 5bc880902..b2bf41825 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNestedTransaction.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.BeforeEach; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java index 7b993e92d..06e2cb826 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestPersistContextClear.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java index 1ba7ffe01..e890b4e9e 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestSavepoint.java @@ -1,9 +1,9 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java index 18174625e..fb1b0a8c3 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestSqlServerBatch.java @@ -1,9 +1,9 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.tests.model.basic.ESimple; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java index 946fcda03..d03fcea7f 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestStatelessUpdateClearPC.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java index 3135fa42f..4edd37ae9 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.TransactionCallbackAdapter; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java index fab0b3eb3..4e2d15159 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionSkipCache.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java index e2511c543..dce5451ec 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionTryResources.java @@ -1,10 +1,10 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DuplicateKeyException; import io.ebean.Transaction; -import io.ebean.annotation.IgnorePlatform; +import io.ebean.xtest.IgnorePlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java index f6bf776a8..3ae5e80d2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java index b530252f8..bc59408ca 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNotSupports.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java index 2c8156ccb..9b20104eb 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalReadOnly.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java index a3c367dc3..4b48f682c 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequired.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java index 3e38e2d0c..37a8760ed 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalRequiresNew.java @@ -3,6 +3,7 @@ package org.tests.transaction; import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxType; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java index 53b55b6bb..bf881b878 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalSupports.java @@ -1,6 +1,6 @@ package org.tests.transaction; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.annotation.Transactional; diff --git a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java index 74c3f3efb..52c323884 100644 --- a/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java +++ b/ebean-test/src/test/java/org/tests/transparentpersist/TestTransparentPersist.java @@ -4,6 +4,7 @@ import io.ebean.*; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxOption; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiBeanTypeManager; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java index 4fdeaea07..7d078179a 100644 --- a/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java +++ b/ebean-test/src/test/java/org/tests/types/TestEncryptedString.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileType.java b/ebean-test/src/test/java/org/tests/types/TestFileType.java index 39dc9e528..28e1e02a5 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileType.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileType.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java index 6518e2919..e529a065a 100644 --- a/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java +++ b/ebean-test/src/test/java/org/tests/types/TestFileTypeFetching.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.BeanState; import io.ebean.DB; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/types/TestHstore.java b/ebean-test/src/test/java/org/tests/types/TestHstore.java index e852a6955..5f93c332d 100644 --- a/ebean-test/src/test/java/org/tests/types/TestHstore.java +++ b/ebean-test/src/test/java/org/tests/types/TestHstore.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; import org.assertj.core.api.Assertions; diff --git a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java index 90ffd842a..81dd15433 100644 --- a/ebean-test/src/test/java/org/tests/types/TestNewTypes.java +++ b/ebean-test/src/test/java/org/tests/types/TestNewTypes.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.plugin.BeanType; import io.ebean.plugin.ExpressionPath; diff --git a/ebean-test/src/test/java/org/tests/types/TestPeriodType.java b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java index e398e85bb..3717ed66d 100644 --- a/ebean-test/src/test/java/org/tests/types/TestPeriodType.java +++ b/ebean-test/src/test/java/org/tests/types/TestPeriodType.java @@ -1,6 +1,6 @@ package org.tests.types; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.types.SomePeriodBean; diff --git a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java index daa493385..8b3ebb317 100644 --- a/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java +++ b/ebean-test/src/test/java/org/tests/unidirectional/TestUniDirectional.java @@ -1,6 +1,6 @@ package org.tests.unidirectional; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.UTDetail; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java index 915df69e0..c0bb5750f 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestEqualsOnEnhanced.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.Order; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java index 668be5317..f4ab59e0e 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestNullCollectionSet.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java index 3f65621b6..4fb45fef6 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestOrderByParse.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.OrderBy; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index fcfcb5aef..f078d2b9d 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java index c580d23cf..daa5fe60e 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestVanillaCollectionSet.java @@ -1,6 +1,6 @@ package org.tests.unitinternal; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.bean.BeanCollection; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java index 3bc09dae3..4bb232bbf 100644 --- a/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestEmbeddedRefreshUpdate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.embedded.EEmbDatePeriod; diff --git a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java index 009283e11..3e9d7cd79 100644 --- a/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestJsonStatelessUpdate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.text.json.JsonContext; import io.ebean.text.json.JsonWriteOptions; diff --git a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java index 49d6f7222..bc74fca70 100644 --- a/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java +++ b/ebean-test/src/test/java/org/tests/update/TestMarkAsDirty.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicVer; diff --git a/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java index f8d32bcca..5b3798cab 100644 --- a/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java +++ b/ebean-test/src/test/java/org/tests/update/TestPostgresTruncate.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; public class TestPostgresTruncate extends BaseTestCase { diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java index cd06f3711..cf66e6753 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBatch.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java index 1c05bed7f..17631f371 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateBindMultipleLists.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java index 0aad43977..333380318 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateExceptions.java @@ -1,6 +1,7 @@ package org.tests.update; import io.ebean.*; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java index 13d72c689..ccbfc084b 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateInTxn.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java index ffa1bd26b..7dbf7c5ab 100644 --- a/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java +++ b/ebean-test/src/test/java/org/tests/update/TestSqlUpdateUpsert.java @@ -1,9 +1,9 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlUpdate; -import io.ebean.annotation.ForPlatform; +import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import org.junit.jupiter.api.Test; @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestSqlUpdateUpsert extends BaseTestCase { private static boolean useV1Syntax = Boolean.getBoolean("ebean.h2.useV1Syntax"); - + @ForPlatform(Platform.H2) @Test public void h2Merge() throws InterruptedException { diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java index 416e6f974..1b06ca0f1 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateAllLoadedProperties.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Database; import io.ebean.Transaction; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java index cfdd8b1cf..cbb0fe697 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdateCircularSave.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java index e4fecaed8..cfc7e5b43 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartial.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.SqlRow; import org.junit.jupiter.api.BeforeAll; diff --git a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java index 0af27a760..19e572df4 100644 --- a/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java +++ b/ebean-test/src/test/java/org/tests/update/TestUpdatePartialNoVer.java @@ -1,6 +1,6 @@ package org.tests.update; -import io.ebean.BaseTestCase; +import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic;