#432 Can't seem to supply my own id for idtables

JetBrains · Feb 9, 2019 · 2c2f47d · 2c2f47d
1 parent d3987ac
commit 2c2f47d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt b/src/main/kotlin/org/jetbrains/exposed/sql/statements/InsertStatement.kt
@@ -18,11 +18,14 @@ open class InsertStatement<Key:Any>(val table: Table, val isIgnore: Boolean = fa
     @Deprecated("Will be made internal on the next releases")
     open val generatedKey: Key? get() = autoIncColumns.firstOrNull()?.let { get(it) } as Key?
 
-    infix operator fun <T> get(column: Column<T>): T? = resultedValues?.get(0)?.tryGet(column)
-            ?: if (!isIgnore) error("No key generated") else null
+    infix operator fun <T> get(column: Column<T>): T? {
+        val row = resultedValues?.get(0)
+        if (row == null && !isIgnore)  error("No key generated")
+        return row?.tryGet(column)
+    }
 
     private fun processResults(rs: ResultSet?, inserted: Int): List<ResultRow> {
-        val autoGeneratedKeys = arrayListOf<MutableMap<Column<*>, Any>>()
+        val autoGeneratedKeys = arrayListOf<MutableMap<Column<*>, Any?>>()
 
         if (inserted > 0) {
             val firstAutoIncColumn = autoIncColumns.firstOrNull()
@@ -58,16 +61,12 @@ open class InsertStatement<Key:Any>(val table: Table, val isIgnore: Boolean = fa
         }
 
         arguments!!.forEachIndexed { itemIndx, pairs ->
+            val map = autoGeneratedKeys.getOrNull(itemIndx) ?: hashMapOf<Column<*>, Any?>().apply {
+                autoGeneratedKeys.add(itemIndx, this)
+            }
             pairs.forEach { (col, value) ->
-                if (!col.columnType.isAutoInc) {
-                    val map = autoGeneratedKeys.getOrElse(itemIndx) {
-                        hashMapOf<Column<*>, Any>().apply {
-                            autoGeneratedKeys.add(itemIndx, this)
-                        }
-                    }
-                    if (col.defaultValueFun != null && value != null/* && data[itemIndx][col] == null*/) {
-                        map[col] = value
-                    }
+                if (!col.columnType.isAutoInc && value != DefaultValueMarker) {
+                    map[col] = value
                 }
             }
         }

diff --git a/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt b/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/DMLTests.kt
@@ -1763,6 +1763,25 @@ class DMLTests : DatabaseTestsBase() {
             println(result)
         }
     }
+
+    @Test fun testInsertWithPredefinedId() {
+        val stringTable = object : IdTable<String>("stringTable") {
+            override val id = varchar("id", 15).entityId()
+            val name = varchar("name", 10)
+        }
+        withTables(stringTable) {
+            val entityID = EntityID("id1", stringTable)
+            val id = stringTable.insertAndGetId {
+                it[id] = entityID
+                it[name] = "foo"
+            }
+
+            assertEquals(id, entityID)
+            val row1 = stringTable.select { stringTable.id eq entityID }.singleOrNull()
+            assertNotNull(row1)
+            assertEquals(row1[stringTable.id], entityID)
+        }
+    }
 }
 
 private val today: DateTime = DateTime.now().withTimeAtStartOfDay()