diff --git a/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt b/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt index ae75765cf7..2467888128 100644 --- a/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt +++ b/exposed-tests/src/main/kotlin/org/jetbrains/exposed/sql/tests/DatabaseTestsBase.kt @@ -243,14 +243,16 @@ abstract class DatabaseTestsBase { Assume.assumeTrue(toTest.isNotEmpty()) toTest.forEach { testDB -> withDb(testDB) { - SchemaUtils.createSchema(*schemas) - try { - statement() - commit() // Need commit to persist data before drop schemas - } finally { - val cascade = it != TestDB.SQLSERVER - SchemaUtils.dropSchema(*schemas, cascade = cascade) - commit() + if (currentDialectTest.supportsCreateSchema) { + SchemaUtils.createSchema(*schemas) + try { + statement() + commit() // Need commit to persist data before drop schemas + } finally { + val cascade = it != TestDB.SQLSERVER + SchemaUtils.dropSchema(*schemas, cascade = cascade) + commit() + } } } } diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt index 7ce54f56dd..6e03db6e87 100644 --- a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt +++ b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt @@ -810,7 +810,7 @@ class DDLTests : DatabaseTestsBase() { fun createTableWithForeignKeyToAnotherSchema() { val one = prepareSchemaForTest("one") val two = prepareSchemaForTest("two") - withSchemas(excludeSettings = listOf(TestDB.SQLITE), schemas = arrayOf(two, one)) { + withSchemas(two, one) { SchemaUtils.create(TableFromSchemeOne) if (currentDialectTest is OracleDialect) { exec("GRANT SELECT ON ${TableFromSchemeOne.tableName} to TWO;") @@ -994,7 +994,7 @@ class DDLTests : DatabaseTestsBase() { override val primaryKey = PrimaryKey(arrayOf(idA, idB)) } - withSchemas(excludeSettings = listOf(TestDB.SQLITE), schemas = arrayOf(one)) { + withSchemas(one) { SchemaUtils.create(tableA, tableB) tableA.insert { it[idA] = 1; it[idB] = 1 } tableB.insert { it[idA] = 1; it[idB] = 1 } diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt index 1662c021b7..c298f381c5 100644 --- a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt +++ b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/SchemaTests.kt @@ -106,7 +106,7 @@ class SchemaTests : DatabaseTestsBase() { val schema2 = Schema("redundant") val schemasTryingToCreate = listOf(schema1, schema1, schema2) - withSchemas(excludeSettings = listOf(TestDB.SQLITE), schemas = arrayOf(schema1, schema1, schema2)) { + withSchemas(schema1, schema1, schema2) { val toCreate = schemasTryingToCreate.filterNot { it.exists() } /** schema1 and schema2 have been created, so there is no remaining schema to be created */ assertTrue(toCreate.isEmpty())