optReference column should allow update { it[column] = nullableValue } …

…#1275
JetBrains · Dec 4, 2021 · bd0bdab · bd0bdab
1 parent 621dc5b
commit bd0bdab
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/UpdateBuilder.kt b/exposed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/UpdateBuilder.kt
@@ -36,16 +36,13 @@ abstract class UpdateBuilder<out T>(type: StatementType, targets: List<Table>) :
     }
 
     @JvmName("setWithEntityIdValue")
-    operator fun <S : Comparable<S>, ID : EntityID<S>, E : S?> set(column: Column<ID>, value: E) {
-        require(column.columnType.nullable || (value != null && !value.equals(Op.NULL))) {
-            "Trying to set null to not nullable column $column"
-        }
+    operator fun <S : Comparable<S>, E : S, ID : EntityID<E>?> set(column: Column<ID>, value: S) {
         column.columnType.validateValueBeforeUpdate(value)
         values[column] = value
     }
 
     @JvmName("setWithEntityIdExpression")
-    operator fun <S, ID : EntityID<S>, E : Expression<S>> set(column: Column<ID>, value: E) {
+    operator fun <S : Any?, ID : EntityID<S>, E : Expression<S>> set(column: Column<ID>, value: E) {
         require(column.columnType.nullable || value != Op.NULL) {
             "Trying to set null to not nullable column $column"
         }
@@ -58,7 +55,7 @@ abstract class UpdateBuilder<out T>(type: StatementType, targets: List<Table>) :
 
     open operator fun <S> set(column: Column<S>, value: Query) = update(column, wrapAsExpression(value))
 
-    open operator fun <S> set(column: CompositeColumn<S>, value: S) {
+    open operator fun <S : Any> set(column: CompositeColumn<S>, value: S) {
         column.getRealColumnsWithValues(value).forEach { (realColumn, itsValue) -> set(realColumn as Column<Any?>, itsValue) }
     }
 

diff --git a/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/InsertTests.kt b/exposed-tests/src/test/kotlin/org/jetbrains/exposed/sql/tests/shared/dml/InsertTests.kt
@@ -11,6 +11,7 @@ import org.jetbrains.exposed.sql.tests.DatabaseTestsBase
 import org.jetbrains.exposed.sql.tests.TestDB
 import org.jetbrains.exposed.sql.tests.currentDialectTest
 import org.jetbrains.exposed.sql.tests.shared.*
+import org.jetbrains.exposed.sql.tests.shared.entities.EntityTests
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import org.jetbrains.exposed.sql.vendors.MysqlDialect
 import org.junit.Test
@@ -19,6 +20,7 @@ import java.sql.SQLException
 import java.util.*
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.fail
 
 class InsertTests : DatabaseTestsBase() {
@@ -520,4 +522,27 @@ class InsertTests : DatabaseTestsBase() {
             }
         }
     }
+
+    @Test fun `test optReference allows null values`() {
+        withTables(EntityTests.Posts) {
+            val id1 = EntityTests.Posts.insertAndGetId {
+                it[board] = null
+                it[category] = null
+            }
+
+            val inserted1 = EntityTests.Posts.select { EntityTests.Posts.id eq id1 }.single()
+            assertNull(inserted1[EntityTests.Posts.board])
+            assertNull(inserted1[EntityTests.Posts.category])
+
+            val boardId = EntityTests.Boards.insertAndGetId {
+                it[name] = UUID.randomUUID().toString()
+            }
+
+            val id2 = EntityTests.Posts.insertAndGetId {
+                it[board] = Op.nullOp()
+                it[category] = null
+                it[board] = boardId.value
+            }
+        }
+    }
 }