#535 SchemaUtils.createMissingTablesAndColumns doesn't correctly chec…

…k constraints in H2 sqlite create unique index broken
JetBrains · Mar 30, 2019 · 73cbc57 · 73cbc57
1 parent 62925f8
commit 73cbc57
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SchemaUtils.kt b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/SchemaUtils.kt
@@ -202,8 +202,9 @@ object SchemaUtils {
                 }
                 commit()
             }
+            val executedStatements = createStatements + alterStatements
             logTimeSpent("Checking mapping consistence") {
-                for (statement in checkMappingConsistence(*tables).filter { it !in statements }) {
+                for (statement in checkMappingConsistence(*tables).filter { it !in executedStatements }) {
                     exec(statement)
                 }
                 commit()

diff --git a/exposed/src/main/kotlin/org/jetbrains/exposed/sql/vendors/SQLiteDialect.kt b/exposed/src/main/kotlin/org/jetbrains/exposed/sql/vendors/SQLiteDialect.kt
@@ -52,7 +52,7 @@ open class SQLiteDialect : VendorDialect(dialectName, SQLiteDataTypeProvider, SQ
 
     override fun createIndex(index: Index): String {
         val originalCreateIndex = super.createIndex(index.copy(unique = false))
-        return if (index.unique) originalCreateIndex.replace("INDEX", "UNIQUE INDEX")
+        return if (index.unique) originalCreateIndex.replace("CREATE INDEX", "CREATE UNIQUE INDEX")
         else originalCreateIndex
     }
 

diff --git a/exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt b/exposed/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DDLTests.kt
@@ -831,6 +831,23 @@ class DDLTests : DatabaseTestsBase() {
             assertEquals(0, query.count())
         }
     }
+
+    @Test
+    fun createTableWithMultipleIndexes() {
+        withDb {
+            SchemaUtils.createMissingTablesAndColumns(MultipleIndexesTable)
+        }
+    }
+
+    object MultipleIndexesTable: Table("H2_MULTIPLE_INDEXES") {
+        val value1 = varchar("value1", 255)
+        val value2 = varchar("value2", 255)
+
+        init {
+            uniqueIndex("index1", value1, value2)
+            uniqueIndex("index2", value2, value1)
+        }
+    }
 }
 
 private fun String.inProperCase(): String = TransactionManager.currentOrNull()?.let { tm ->