Postgresql uniqueIndex error with sheme. #803 / exclude SQL Server fr…

…om test
JetBrains · Aug 2, 2020 · 8b8f756 · 8b8f756
1 parent 388b68d
commit 8b8f756
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
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
@@ -33,14 +33,18 @@ class SchemaTests : DatabaseTestsBase() {
     fun `create and set schema tests`() {
         withDb(excludeSettings = listOf(TestDB.MYSQL, TestDB.MARIADB)) {
             if (currentDialect.supportsCreateSchema) {
-                val schema = if (currentDialect is SQLServerDialect) {
-                    exec("GRANT CREATE SCHEMA TO guest")
-                    exec("SETUSER 'guest'")
-                    Schema("MYSCHEMA", "guest")
-                } else if (currentDialect is OracleDialect) {
-                    Schema("MYSCHEMA", password = "pwd4myschema", defaultTablespace = "tbs_perm_01", quota = "20M", on = "tbs_perm_01")
-                } else {
-                    Schema("MYSCHEMA")
+                val schema = when (currentDialect) {
+                    is SQLServerDialect -> {
+                        exec("GRANT CREATE SCHEMA TO guest")
+                        exec("SETUSER 'guest'")
+                        Schema("MYSCHEMA", "guest")
+                    }
+                    is OracleDialect -> {
+                        Schema("MYSCHEMA", password = "pwd4myschema", defaultTablespace = "tbs_perm_01", quota = "20M", on = "tbs_perm_01")
+                    }
+                    else -> {
+                        Schema("MYSCHEMA")
+                    }
                 }
 
                 try {

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/ddl/CreateIndexTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/ddl/CreateIndexTests.kt
@@ -74,7 +74,7 @@ class CreateIndexTests : DatabaseTestsBase() {
         }
         val schema1 = Schema("Schema1")
         val schema2 = Schema("Schema2")
-        withSchemas(listOf(TestDB.SQLITE), schema1, schema2) {
+        withSchemas(listOf(TestDB.SQLITE, TestDB.SQLSERVER), schema1, schema2) {
             SchemaUtils.setSchema(schema1)
             SchemaUtils.createMissingTablesAndColumns(TestTable)
             assertEquals(true, TestTable.exists())