Update the Kotlin DSL for KeyHolder Support

Author: jeffgbutler

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

@@ -22,6 +22,7 @@ import org.mybatis.dynamic.sql.select.AbstractQueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
 import org.mybatis.dynamic.sql.where.AbstractWhereDSL
 
+@Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 @DslMarker
 annotation class MyBatisDslMarker
 

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

@@ -25,10 +25,10 @@ import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel
 import org.mybatis.dynamic.sql.util.Buildable
 
-typealias GeneralInsertCompleter = GeneralInsertDSL.() -> Buildable<GeneralInsertModel>
+typealias GeneralInsertCompleter = @MyBatisDslMarker GeneralInsertDSL.() -> Buildable<GeneralInsertModel>
 
-typealias InsertCompleter<T> = InsertDSL<T>.() -> Buildable<InsertModel<T>>
+typealias InsertCompleter<T> = @MyBatisDslMarker InsertDSL<T>.() -> Buildable<InsertModel<T>>
 
-typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> Buildable<MultiRowInsertModel<T>>
+typealias MultiRowInsertCompleter<T> = @MyBatisDslMarker MultiRowInsertDSL<T>.() -> Buildable<MultiRowInsertModel<T>>
 
-typealias BatchInsertCompleter<T> = BatchInsertDSL<T>.() -> Buildable<BatchInsertModel<T>>
+typealias BatchInsertCompleter<T> = @MyBatisDslMarker BatchInsertDSL<T>.() -> Buildable<BatchInsertModel<T>>

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/NamedParameterJdbcTemplateExtensions.kt

@@ -117,8 +117,8 @@ fun <T> NamedParameterJdbcTemplate.insertMultiple(
     update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement), keyHolder)
 
 // insert with KeyHolder support
-fun NamedParameterJdbcTemplate.withKeyHolder(keyHolder: KeyHolder) =
-    KeyHolderHelper(keyHolder, this)
+fun NamedParameterJdbcTemplate.withKeyHolder(keyHolder: KeyHolder, build: KeyHolderHelper.() -> Int) =
+    build(KeyHolderHelper(keyHolder, this))
 
 fun NamedParameterJdbcTemplate.select(vararg selectList: BasicColumn) =
     SelectListFromGatherer(selectList.toList(), this)

src/test/kotlin/examples/kotlin/spring/canonical/CanonicalSpringKotlinTemplateDirectTest.kt

@@ -252,9 +252,11 @@ class CanonicalSpringKotlinTemplateDirectTest {
     fun testGeneralInsertWithGeneratedKey() {
         val keyHolder = GeneratedKeyHolder()
 
-        val rows = template.withKeyHolder(keyHolder).insertInto(GeneratedAlways) {
-            set(GeneratedAlways.firstName).toValue("Fred")
-            set(GeneratedAlways.lastName).toValue("Flintstone")
+        val rows = template.withKeyHolder(keyHolder) {
+            insertInto(GeneratedAlways) {
+                set(GeneratedAlways.firstName).toValue("Fred")
+                set(GeneratedAlways.lastName).toValue("Flintstone")
+            }
         }
 
         assertThat(rows).isEqualTo(1)
@@ -268,9 +270,11 @@ class CanonicalSpringKotlinTemplateDirectTest {
 
         val keyHolder = GeneratedKeyHolder()
 
-        val rows = template.withKeyHolder(keyHolder).insert(record).into(GeneratedAlways) {
-            map(GeneratedAlways.firstName).toProperty("firstName")
-            map(GeneratedAlways.lastName).toProperty("lastName")
+        val rows = template.withKeyHolder(keyHolder) {
+            insert(record).into(GeneratedAlways) {
+                map(GeneratedAlways.firstName).toProperty("firstName")
+                map(GeneratedAlways.lastName).toProperty("lastName")
+            }
         }
 
         assertThat(rows).isEqualTo(1)
@@ -285,11 +289,12 @@ class CanonicalSpringKotlinTemplateDirectTest {
 
         val keyHolder = GeneratedKeyHolder()
 
-        val rows = template.withKeyHolder(keyHolder).insertMultiple(record1, record2)
-            .into(GeneratedAlways) {
+        val rows = template.withKeyHolder(keyHolder) {
+            insertMultiple(record1, record2).into(GeneratedAlways) {
                 map(GeneratedAlways.firstName).toProperty("firstName")
                 map(GeneratedAlways.lastName).toProperty("lastName")
             }
+        }
 
         assertThat(rows).isEqualTo(2)
         assertThat(keyHolder.keyList[0]).containsEntry("ID", 22)