SchemaUtils.createMissingTablesAndColumns raise NoSuchElementException

#1568
JetBrains · Oct 2, 2022 · 070bff8 · 070bff8
1 parent 8caecbc
commit 070bff8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...dbc/src/main/kotlin/org/jetbrains/exposed/sql/statements/jdbc/JdbcDatabaseMetadataImpl.kt b/...dbc/src/main/kotlin/org/jetbrains/exposed/sql/statements/jdbc/JdbcDatabaseMetadataImpl.kt
@@ -221,17 +221,17 @@ class JdbcDatabaseMetadataImpl(database: String, val metadata: DatabaseMetaData)
             metadata.getImportedKeys(databaseName, currentScheme, table).iterate {
                 val fromTableName = getString("FKTABLE_NAME")!!
                 val fromColumnName = identifierManager.quoteIdentifierWhenWrongCaseOrNecessary(getString("FKCOLUMN_NAME")!!)
-                val fromColumn = allTables.getValue(fromTableName).columns.firstOrNull {
+                val fromColumn = allTables[fromTableName]?.columns?.firstOrNull {
                     identifierManager.quoteIdentifierWhenWrongCaseOrNecessary(it.name) == fromColumnName
                 } ?: return@iterate null // Do not crash if there are missing fields in Exposed's tables
                 val constraintName = getString("FK_NAME")!!
                 val targetTableName = getString("PKTABLE_NAME")!!
                 val targetColumnName = identifierManager.quoteIdentifierWhenWrongCaseOrNecessary(
                     identifierManager.inProperCase(getString("PKCOLUMN_NAME")!!)
                 )
-                val targetColumn = allTables.getValue(targetTableName).columns.first {
+                val targetColumn = allTables[targetTableName]?.columns?.firstOrNull {
                     identifierManager.quoteIdentifierWhenWrongCaseOrNecessary(it.nameInDatabaseCase()) == targetColumnName
-                }
+                } ?: return@iterate null // Do not crash if there are missing fields in Exposed's tables
                 val constraintUpdateRule = ReferenceOption.resolveRefOptionFromJdbc(getInt("UPDATE_RULE"))
                 val constraintDeleteRule = ReferenceOption.resolveRefOptionFromJdbc(getInt("DELETE_RULE"))
                 ForeignKeyConstraint(