Support upsert on doma-kotlin

momosetkn · momosetkn · commit c8192099e07a · 2024-03-20T16:29:30.000+09:00
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/KEntityql.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/KEntityql.kt
@@ -51,7 +51,7 @@ class KEntityql(config: Config) {
         entityMetamodel: EntityMetamodel<ENTITY>,
         entity: ENTITY,
         block: InsertSettings.() -> Unit = {},
-    ): KStatement<Result<ENTITY>> {
+    ): KEntityqlInsertStatement<ENTITY> {
         val statement = entityql.insert(entityMetamodel, entity, block)
         return KEntityqlInsertStatement(statement)
     }
@@ -78,7 +78,7 @@ class KEntityql(config: Config) {
         entityMetamodel: EntityMetamodel<ENTITY>,
         entities: List<ENTITY>,
         block: InsertSettings.() -> Unit = {},
-    ): KStatement<BatchResult<ENTITY>> {
+    ): KEntityqlBatchInsertStatement<ENTITY> {
         val statement = entityql.insert(entityMetamodel, entities, block)
         return KEntityqlBatchInsertStatement(statement)
     }
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlBatchInsertStatement.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlBatchInsertStatement.kt
@@ -2,12 +2,20 @@ package org.seasar.doma.kotlin.jdbc.criteria.statement
 
 import org.seasar.doma.jdbc.BatchResult
 import org.seasar.doma.jdbc.Sql
-import org.seasar.doma.jdbc.criteria.statement.Statement
+import org.seasar.doma.jdbc.criteria.statement.EntityqlBatchInsertStatement
 
 class KEntityqlBatchInsertStatement<ENTITY>(
-    private val statement: Statement<BatchResult<ENTITY>>,
+    private val statement: EntityqlBatchInsertStatement<ENTITY>,
 ) : KStatement<BatchResult<ENTITY>> {
 
+    fun onDuplicateKeyUpdate(): KStatement<BatchResult<ENTITY>> {
+        return KEntityqlBatchUpsertStatement(statement.onDuplicateKeyUpdate())
+    }
+
+    fun onDuplicateKeyIgnore(): KStatement<BatchResult<ENTITY>> {
+        return KEntityqlBatchUpsertStatement(statement.onDuplicateKeyIgnore())
+    }
+
     override fun execute(): BatchResult<ENTITY> {
         return statement.execute()
     }
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlBatchUpsertStatement.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlBatchUpsertStatement.kt
@@ -0,0 +1,16 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.BatchResult
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.statement.Statement
+
+class KEntityqlBatchUpsertStatement<ENTITY>(private val statement: Statement<BatchResult<ENTITY>>) : KStatement<BatchResult<ENTITY>> {
+
+    override fun execute(): BatchResult<ENTITY> {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+}
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlInsertStatement.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlInsertStatement.kt
@@ -2,12 +2,20 @@ package org.seasar.doma.kotlin.jdbc.criteria.statement
 
 import org.seasar.doma.jdbc.Result
 import org.seasar.doma.jdbc.Sql
-import org.seasar.doma.jdbc.criteria.statement.Statement
+import org.seasar.doma.jdbc.criteria.statement.EntityqlInsertStatement
 
 class KEntityqlInsertStatement<ENTITY>(
-    private val statement: Statement<Result<ENTITY>>,
+    private val statement: EntityqlInsertStatement<ENTITY>,
 ) : KStatement<Result<ENTITY>> {
 
+    fun onDuplicateKeyUpdate(): KStatement<Result<ENTITY>> {
+        return KEntityqlUpsertStatement(statement.onDuplicateKeyUpdate())
+    }
+
+    fun onDuplicateKeyIgnore(): KStatement<Result<ENTITY>> {
+        return KEntityqlUpsertStatement(statement.onDuplicateKeyIgnore())
+    }
+
     override fun execute(): Result<ENTITY> {
         return statement.execute()
     }
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlUpsertStatement.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KEntityqlUpsertStatement.kt
@@ -0,0 +1,16 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.Result
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.statement.Statement
+
+class KEntityqlUpsertStatement<ENTITY>(private val statement: Statement<Result<ENTITY>>) : KStatement<Result<ENTITY>> {
+
+    override fun execute(): Result<ENTITY> {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+}
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlInsertTerminal.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlInsertTerminal.kt
@@ -9,6 +9,14 @@ class KNativeSqlInsertTerminal(private val statement: NativeSqlInsertTerminal) :
         return statement.execute()
     }
 
+    fun onDuplicateKeyUpdate(): KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys {
+        return KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys(statement.onDuplicateKeyUpdate())
+    }
+
+    fun onDuplicateKeyIgnore(): KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys {
+        return KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys(statement.onDuplicateKeyIgnore())
+    }
+
     override fun asSql(): Sql<*> {
         return statement.asSql()
     }
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys.kt
@@ -0,0 +1,24 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel
+import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys
+
+class KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys(val statement: NativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys) : KStatement<Int> {
+    fun keys(vararg keys: PropertyMetamodel<*>): KNativeSqlUpsertTerminal {
+        return KNativeSqlUpsertTerminal(statement.keys(*keys))
+    }
+
+    override fun execute(): Int {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+
+    override fun peek(block: (Sql<*>) -> Unit): KStatement<Int> {
+        statement.peek(block)
+        return this
+    }
+}
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys.kt
@@ -0,0 +1,30 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.declaration.InsertOnDuplicateKeyUpdateSetValuesDeclaration
+import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel
+import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys
+import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpsertTerminal
+
+class KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys(val statement: NativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys) : KStatement<Int> {
+    fun keys(vararg keys: PropertyMetamodel<*>): KNativeSqlUpsertOnDuplicateKeyUpdateSelectingSet {
+        return KNativeSqlUpsertOnDuplicateKeyUpdateSelectingSet(statement.keys(*keys))
+    }
+
+    fun set(block: (InsertOnDuplicateKeyUpdateSetValuesDeclaration) -> Unit): NativeSqlUpsertTerminal {
+        return statement.set(block)
+    }
+
+    override fun execute(): Int {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+
+    override fun peek(block: (Sql<*>) -> Unit): KStatement<Int> {
+        statement.peek(block)
+        return this
+    }
+}
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyUpdateSelectingSet.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertOnDuplicateKeyUpdateSelectingSet.kt
@@ -0,0 +1,24 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.declaration.InsertOnDuplicateKeyUpdateSetValuesDeclaration
+import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpsertOnDuplicateKeyUpdateSelectingSet
+
+class KNativeSqlUpsertOnDuplicateKeyUpdateSelectingSet(val statement: NativeSqlUpsertOnDuplicateKeyUpdateSelectingSet) : KStatement<Int> {
+    fun set(block: (InsertOnDuplicateKeyUpdateSetValuesDeclaration) -> Unit): KNativeSqlUpsertTerminal {
+        return KNativeSqlUpsertTerminal(statement.set(block))
+    }
+
+    override fun execute(): Int {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+
+    override fun peek(block: (Sql<*>) -> Unit): KStatement<Int> {
+        statement.peek(block)
+        return this
+    }
+}
diff --git a/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertTerminal.kt b/doma-kotlin/src/main/kotlin/org/seasar/doma/kotlin/jdbc/criteria/statement/KNativeSqlUpsertTerminal.kt
@@ -0,0 +1,19 @@
+package org.seasar.doma.kotlin.jdbc.criteria.statement
+
+import org.seasar.doma.jdbc.Sql
+import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpsertTerminal
+
+class KNativeSqlUpsertTerminal(val statement: NativeSqlUpsertTerminal) : KStatement<Int> {
+    override fun execute(): Int {
+        return statement.execute()
+    }
+
+    override fun asSql(): Sql<*> {
+        return statement.asSql()
+    }
+
+    override fun peek(block: (Sql<*>) -> Unit): KStatement<Int> {
+        statement.peek(block)
+        return this
+    }
+}
diff --git a/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KEntityqlBatchInsertTest.kt b/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KEntityqlBatchInsertTest.kt
@@ -8,8 +8,11 @@ import org.seasar.doma.jdbc.criteria.mock.MockConfig
 import java.math.BigDecimal
 
 internal class KEntityqlBatchInsertTest {
+    private val config = MockConfig().apply {
+        dialect = org.seasar.doma.jdbc.dialect.PostgresDialect()
+    }
 
-    private val entityql = org.seasar.doma.kotlin.jdbc.criteria.KEntityql(MockConfig())
+    private val entityql = org.seasar.doma.kotlin.jdbc.criteria.KEntityql(config)
 
     @Test
     fun insertInto() {
@@ -27,6 +30,38 @@ internal class KEntityqlBatchInsertTest {
         )
     }
 
+    @Test
+    fun insertOnDuplicateKeyUpdate() {
+        val emp = Emp()
+        emp.id = 1
+        emp.name = "aaa"
+        emp.salary = BigDecimal("1000")
+        emp.version = 1
+        val e = Emp_()
+        val stmt = entityql.insert(e, listOf(emp)).onDuplicateKeyUpdate()
+        val sql = stmt.asSql()
+        Assertions.assertEquals(
+            "insert into EMP as target (ID, NAME, SALARY, VERSION) values (1, 'aaa', 1000, 1) on conflict (ID) do update set NAME = excluded.NAME, SALARY = excluded.SALARY, VERSION = excluded.VERSION",
+            sql.formattedSql,
+        )
+    }
+
+    @Test
+    fun insertOnDuplicateKeyIgnore() {
+        val emp = Emp()
+        emp.id = 1
+        emp.name = "aaa"
+        emp.salary = BigDecimal("1000")
+        emp.version = 1
+        val e = Emp_()
+        val stmt = entityql.insert(e, listOf(emp)).onDuplicateKeyIgnore()
+        val sql = stmt.asSql()
+        Assertions.assertEquals(
+            "insert into EMP as target (ID, NAME, SALARY, VERSION) values (1, 'aaa', 1000, 1) on conflict (ID) do nothing",
+            sql.formattedSql,
+        )
+    }
+
     @Test
     fun empty() {
         val e = Emp_()
diff --git a/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KEntityqlInsertTest.kt b/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KEntityqlInsertTest.kt
@@ -8,8 +8,11 @@ import org.seasar.doma.jdbc.criteria.mock.MockConfig
 import java.math.BigDecimal
 
 internal class KEntityqlInsertTest {
+    private val config = MockConfig().apply {
+        dialect = org.seasar.doma.jdbc.dialect.PostgresDialect()
+    }
 
-    private val entityql = org.seasar.doma.kotlin.jdbc.criteria.KEntityql(MockConfig())
+    private val entityql = org.seasar.doma.kotlin.jdbc.criteria.KEntityql(config)
 
     @Test
     fun insertInto() {
@@ -27,6 +30,38 @@ internal class KEntityqlInsertTest {
         )
     }
 
+    @Test
+    fun insertOnDuplicateKeyUpdate() {
+        val emp = Emp()
+        emp.id = 1
+        emp.name = "aaa"
+        emp.salary = BigDecimal("1000")
+        emp.version = 1
+        val e = Emp_()
+        val stmt = entityql.insert(e, emp).onDuplicateKeyUpdate()
+        val sql = stmt.asSql()
+        Assertions.assertEquals(
+            "insert into EMP as target (ID, NAME, SALARY, VERSION) values (1, 'aaa', 1000, 1) on conflict (ID) do update set NAME = excluded.NAME, SALARY = excluded.SALARY, VERSION = excluded.VERSION",
+            sql.formattedSql,
+        )
+    }
+
+    @Test
+    fun insertOnDuplicateKeyIgnore() {
+        val emp = Emp()
+        emp.id = 1
+        emp.name = "aaa"
+        emp.salary = BigDecimal("1000")
+        emp.version = 1
+        val e = Emp_()
+        val stmt = entityql.insert(e, emp).onDuplicateKeyIgnore()
+        val sql = stmt.asSql()
+        Assertions.assertEquals(
+            "insert into EMP as target (ID, NAME, SALARY, VERSION) values (1, 'aaa', 1000, 1) on conflict (ID) do nothing",
+            sql.formattedSql,
+        )
+    }
+
     @Test
     fun excludeNull() {
         val emp = Emp()
diff --git a/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KNativeSqlInsertTest.kt b/doma-kotlin/src/test/kotlin/org/seasar/doma/jdbc/criteria/KNativeSqlInsertTest.kt

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,14 @@ class KNativeSqlInsertTerminal(private val statement: NativeSqlInsertTerminal) :`
`9`	`9`	`return statement.execute()`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ fun onDuplicateKeyUpdate(): KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys {`
	`13`	`+ return KNativeSqlUpsertOnDuplicateKeyUpdateSelectingKeys(statement.onDuplicateKeyUpdate())`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ fun onDuplicateKeyIgnore(): KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys {`
	`17`	`+ return KNativeSqlUpsertOnDuplicateKeyIgnoreSelectingKeys(statement.onDuplicateKeyIgnore())`
	`18`	`+ }`
	`19`	`+`
`12`	`20`	`override fun asSql(): Sql<*> {`
`13`	`21`	`return statement.asSql()`
`14`	`22`	`}`