fix tables creation depending on each other via foreignKey constraint…

…: fix table sorting by references, simplify code
naftalmm · Sep 3, 2023 · e886b84 · e886b84
1 parent 7c8d8a2
commit e886b84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SchemaUtils.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/SchemaUtils.kt
@@ -24,9 +24,7 @@ object SchemaUtils {
                 emptyMap()
             } else {
                 tables.associateWith { t ->
-                    t.columns.mapNotNull { c ->
-                        c.referee?.let { it.table to c.columnType.nullable }
-                    }.toMap()
+                    t.foreignKeys.map { it.targetTable }
                 }
             }
         }
@@ -36,9 +34,7 @@ object SchemaUtils {
 
             fun parseTable(table: Table) {
                 if (result.add(table)) {
-                    table.columns.forEach {
-                        it.referee?.table?.let(::parseTable)
-                    }
+                    table.foreignKeys.map { it.targetTable }.forEach(::parseTable)
                 }
             }
             tables.forEach(::parseTable)
@@ -54,7 +50,7 @@ object SchemaUtils {
             fun traverse(table: Table) {
                 if (table !in visited) {
                     visited += table
-                    graph.getValue(table).forEach { (t, _) ->
+                    graph.getValue(table).forEach { t ->
                         if (t !in visited) {
                             traverse(t)
                         }
@@ -79,7 +75,7 @@ object SchemaUtils {
                 if (table in visited) return false
                 recursion += table
                 visited += table
-                return if (graph[table]!!.any { traverse(it.key) }) {
+                return if (graph[table]!!.any { traverse(it) }) {
                     true
                 } else {
                     recursion -= table

diff --git a/...t/kotlin/org/jetbrains/exposed/sql/tests/shared/ddl/CreateMissingTablesAndColumnsTests.kt b/...t/kotlin/org/jetbrains/exposed/sql/tests/shared/ddl/CreateMissingTablesAndColumnsTests.kt
@@ -19,7 +19,7 @@ import org.jetbrains.exposed.sql.vendors.OracleDialect
 import org.jetbrains.exposed.sql.vendors.PrimaryKeyMetadata
 import org.junit.Test
 import java.math.BigDecimal
-import java.util.*
+import java.util.UUID
 import kotlin.properties.Delegates
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
@@ -540,7 +540,7 @@ class CreateMissingTablesAndColumnsTests : DatabaseTestsBase() {
     }
 
     @Test fun testCreateTableWithReferenceMultipleTimes() {
-        withTables(PlayerTable, SessionsTable) {
+        withTables(SessionsTable, PlayerTable) {
             SchemaUtils.createMissingTablesAndColumns(PlayerTable, SessionsTable)
             SchemaUtils.createMissingTablesAndColumns(PlayerTable, SessionsTable)
         }
@@ -620,7 +620,7 @@ class CreateMissingTablesAndColumnsTests : DatabaseTestsBase() {
 
     @Test
     fun testCreateCompositePrimaryKeyTableAndCompositeForeignKeyTableMultipleTimes() {
-        withTables(CompositePrimaryKeyTable, CompositeForeignKeyTable) {
+        withTables(CompositeForeignKeyTable, CompositePrimaryKeyTable) {
             SchemaUtils.createMissingTablesAndColumns(CompositePrimaryKeyTable, CompositeForeignKeyTable)
             SchemaUtils.createMissingTablesAndColumns(CompositePrimaryKeyTable, CompositeForeignKeyTable)
         }