Build out Kotlin support for limit and order by in delete and update statements

Author: jeffgbutler

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt

@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.util.kotlin
 
+import org.mybatis.dynamic.sql.SortSpecification
 import org.mybatis.dynamic.sql.delete.DeleteDSL
 import org.mybatis.dynamic.sql.delete.DeleteModel
 import org.mybatis.dynamic.sql.util.Buildable
@@ -24,6 +25,10 @@ typealias DeleteCompleter = KotlinDeleteBuilder.() -> Unit
 class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>) :
     KotlinBaseBuilder<DeleteDSL<DeleteModel>>(), Buildable<DeleteModel> {
 
+    fun orderBy(vararg columns: SortSpecification) {
+        dsl.orderBy(columns.toList())
+    }
+
     fun limit(limit: Long) {
         dsl.limit(limit)
     }

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt

@@ -16,6 +16,7 @@
 package org.mybatis.dynamic.sql.util.kotlin
 
 import org.mybatis.dynamic.sql.BasicColumn
+import org.mybatis.dynamic.sql.SortSpecification
 import org.mybatis.dynamic.sql.SqlColumn
 import org.mybatis.dynamic.sql.update.UpdateDSL
 import org.mybatis.dynamic.sql.update.UpdateModel
@@ -28,6 +29,14 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :
 
     fun <T> set(column: SqlColumn<T>): KotlinSetClauseFinisher<T> = KotlinSetClauseFinisher(column)
 
+    fun orderBy(vararg columns: SortSpecification) {
+        dsl.orderBy(columns.toList())
+    }
+
+    fun limit(limit: Long) {
+        dsl.limit(limit)
+    }
+
     override fun build(): UpdateModel = dsl.build()
 
     override fun getDsl(): UpdateDSL<UpdateModel> = dsl

src/test/kotlin/examples/kotlin/mybatis3/mariadb/KItemsDynamicSQLSupport.kt

@@ -23,9 +23,11 @@ object KItemsDynamicSQLSupport {
     val items = Items()
     val id = items.id
     val description = items.description
+    val amount = items.amount
 
     class Items : SqlTable("items") {
         val id = column<Int>(name = "id", jdbcType = JDBCType.INTEGER)
         val description = column<String>(name = "description", jdbcType = JDBCType.VARCHAR)
+        val amount = column<Int>(name = "amount", jdbcType = JDBCType.INTEGER)
     }
 }

src/test/kotlin/examples/kotlin/mybatis3/mariadb/KMariaDBTest.kt

@@ -16,6 +16,7 @@
 package examples.kotlin.mybatis3.mariadb
 
 import config.TestContainersConfiguration
+import examples.kotlin.mybatis3.mariadb.KItemsDynamicSQLSupport.amount
 import examples.kotlin.mybatis3.mariadb.KItemsDynamicSQLSupport.id
 import examples.kotlin.mybatis3.mariadb.KItemsDynamicSQLSupport.items
 import examples.kotlin.mybatis3.mariadb.KItemsDynamicSQLSupport.description
@@ -30,10 +31,14 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
+import org.mybatis.dynamic.sql.util.kotlin.elements.add
+import org.mybatis.dynamic.sql.util.kotlin.elements.constant
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.deleteFrom
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
+import org.mybatis.dynamic.sql.util.kotlin.mybatis3.update
 import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper
 import org.mybatis.dynamic.sql.util.mybatis3.CommonSelectMapper
+import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper
 import org.testcontainers.containers.MariaDBContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
@@ -56,6 +61,7 @@ class KMariaDBTest {
         with(Configuration(environment)) {
             addMapper(CommonDeleteMapper::class.java)
             addMapper(CommonSelectMapper::class.java)
+            addMapper(CommonUpdateMapper::class.java)
             sqlSessionFactory = SqlSessionFactoryBuilder().build(this)
         }
     }
@@ -92,6 +98,58 @@ class KMariaDBTest {
         }
     }
 
+    @Test
+    fun testDeleteWithOrderBy() {
+        newSession().use {
+            val mapper = it.getMapper(CommonDeleteMapper::class.java)
+
+            val deleteStatement = deleteFrom(items) {
+                orderBy(id)
+            }
+
+            assertThat(deleteStatement.deleteStatement).isEqualTo("delete from items order by id")
+
+            val rows = mapper.delete(deleteStatement)
+            assertThat(rows).isEqualTo(20)
+        }
+    }
+
+    @Test
+    fun testUpdateWithLimit() {
+        newSession().use {
+            val mapper = it.getMapper(CommonUpdateMapper::class.java)
+
+            val updateStatement = update(items) {
+                set(amount) equalTo add(amount, constant<Int>("100"))
+                limit(4)
+            }
+
+            assertThat(updateStatement.updateStatement)
+                .isEqualTo("update items set amount = (amount + 100) limit #{parameters.p1}")
+
+            val rows = mapper.update(updateStatement)
+            assertThat(rows).isEqualTo(4)
+        }
+    }
+
+    @Test
+    fun testUpdateWithOrderBy() {
+        newSession().use {
+            val mapper = it.getMapper(CommonUpdateMapper::class.java)
+
+            val updateStatement = update(items) {
+                set(amount) equalTo add(amount, constant<Int>("100"))
+                orderBy(id)
+            }
+
+            assertThat(updateStatement.updateStatement)
+                .isEqualTo("update items set amount = (amount + 100) order by id")
+
+            val rows = mapper.update(updateStatement)
+            assertThat(rows).isEqualTo(20)
+        }
+    }
+
     companion object {
         @Container
         private val mariadb = MariaDBContainer(TestContainersConfiguration.MARIADB_LATEST)