Start work on KeyHolder support in Kotlin

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/util/Buildable.java

@@ -15,7 +15,10 @@
  */
 package org.mybatis.dynamic.sql.util;
 
+import org.jetbrains.annotations.NotNull;
+
 @FunctionalInterface
 public interface Buildable<T> {
+    @NotNull
     T build();
 }

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

@@ -15,34 +15,16 @@
  */
 package org.mybatis.dynamic.sql.util.kotlin
 
-import org.mybatis.dynamic.sql.SqlBuilder
-import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel
 import org.mybatis.dynamic.sql.insert.InsertDSL
 import org.mybatis.dynamic.sql.insert.InsertModel
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel
 import org.mybatis.dynamic.sql.util.Buildable
-import org.mybatis.dynamic.sql.util.kotlin.spring.insert
-import org.mybatis.dynamic.sql.util.kotlin.spring.insertMultiple
-import org.mybatis.dynamic.sql.util.kotlin.spring.into
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 
 typealias GeneralInsertCompleter = GeneralInsertDSL.() -> Buildable<GeneralInsertModel>
 
 typealias InsertCompleter<T> = InsertDSL<T>.() -> Buildable<InsertModel<T>>
 
 typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> Buildable<MultiRowInsertModel<T>>
-
-@MyBatisDslMarker
-class MultiRowInsertHelper<T>(private val records: List<T>, private val template: NamedParameterJdbcTemplate) {
-    fun into(table: SqlTable, completer: MultiRowInsertCompleter<T>) =
-        template.insertMultiple(SqlBuilder.insertMultiple(records).into(table, completer))
-}
-
-@MyBatisDslMarker
-class SingleRowInsertHelper<T>(private val record: T, private val template: NamedParameterJdbcTemplate) {
-    fun into(table: SqlTable, completer: InsertCompleter<T>) =
-        template.insert(SqlBuilder.insert(record).into(table, completer))
-}

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

@@ -31,13 +31,15 @@ import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
 import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
 import org.mybatis.dynamic.sql.util.kotlin.GeneralInsertCompleter
 import org.mybatis.dynamic.sql.util.kotlin.InsertCompleter
-import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertHelper
+import org.mybatis.dynamic.sql.util.kotlin.MultiRowInsertCompleter
+import org.mybatis.dynamic.sql.util.kotlin.MyBatisDslMarker
 import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
-import org.mybatis.dynamic.sql.util.kotlin.SingleRowInsertHelper
 import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
 import org.springframework.dao.EmptyResultDataAccessException
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
+import org.springframework.jdbc.support.KeyHolder
 import java.sql.ResultSet
 
 fun NamedParameterJdbcTemplate.count(selectStatement: SelectStatementProvider) =
@@ -76,6 +78,9 @@ fun <T> NamedParameterJdbcTemplate.insert(record: T, table: SqlTable, completer:
 fun NamedParameterJdbcTemplate.insert(insertStatement: GeneralInsertStatementProvider) =
     update(insertStatement.insertStatement, insertStatement.parameters)
 
+fun NamedParameterJdbcTemplate.insert(insertStatement: GeneralInsertStatementProvider, keyHolder: KeyHolder) =
+    update(insertStatement.insertStatement, MapSqlParameterSource(insertStatement.parameters), keyHolder)
+
 fun NamedParameterJdbcTemplate.insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
     insert(org.mybatis.dynamic.sql.util.kotlin.spring.insertInto(table, completer))
 
@@ -185,3 +190,15 @@ class SelectOneMapperGatherer(
     fun <T> withRowMapper(rowMapper: (rs: ResultSet, rowNum: Int) -> T) =
         template.selectOne(selectStatement, rowMapper)
 }
+
+@MyBatisDslMarker
+class MultiRowInsertHelper<T>(private val records: List<T>, private val template: NamedParameterJdbcTemplate) {
+    fun into(table: SqlTable, completer: MultiRowInsertCompleter<T>) =
+        template.insertMultiple(SqlBuilder.insertMultiple(records).into(table, completer))
+}
+
+@MyBatisDslMarker
+class SingleRowInsertHelper<T>(private val record: T, private val template: NamedParameterJdbcTemplate) {
+    fun into(table: SqlTable, completer: InsertCompleter<T>) =
+        template.insert(SqlBuilder.insert(record).into(table, completer))
+}

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

@@ -16,6 +16,7 @@
 package examples.kotlin.spring.canonical
 
 import examples.kotlin.spring.canonical.AddressDynamicSqlSupport.Address
+import examples.kotlin.spring.canonical.GeneratedAlwaysDynamicSqlSupport.GeneratedAlways
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.addressId
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.birthDate
@@ -32,18 +33,21 @@ import org.mybatis.dynamic.sql.util.kotlin.spring.*
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
+import org.springframework.jdbc.support.GeneratedKeyHolder
 import java.util.*
 
 class CanonicalSpringKotlinTemplateDirectTest {
     private lateinit var template: NamedParameterJdbcTemplate
 
     @BeforeEach
     fun setup() {
-        val db = EmbeddedDatabaseBuilder()
-            .setType(EmbeddedDatabaseType.HSQL)
-            .generateUniqueName(true)
-            .addScript("classpath:/examples/kotlin/spring/CreateSimpleDB.sql")
-            .build()
+        val db = EmbeddedDatabaseBuilder().run {
+            setType(EmbeddedDatabaseType.HSQL)
+            generateUniqueName(true)
+            addScript("classpath:/examples/kotlin/spring/CreateGeneratedAlwaysDB.sql")
+            addScript("classpath:/examples/kotlin/spring/CreateSimpleDB.sql")
+            build()
+        }
         template = NamedParameterJdbcTemplate(db)
     }
 
@@ -229,6 +233,16 @@ class CanonicalSpringKotlinTemplateDirectTest {
     }
 
     fun testGeneralInsertWithGeneratedKey() {
+//        val keyHolder = GeneratedKeyHolder()
+//
+//        val rows = template.insertInto(GeneratedAlways) {
+//            set(GeneratedAlways.firstName).toValue("Fred")
+//            set(GeneratedAlways.lastName).toValue("Flintstone")
+//        }.withKeyHolder(keyHolder)
+//
+//        assertThat(rows).isEqualTo(1)
+//        assertThat(keyHolder.keys).containsEntry("ID", 22)
+//        assertThat(keyHolder.keys).containsEntry("FULL_NAME", "Fred Flintstone")
         TODO()
     }
 

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

@@ -16,6 +16,7 @@
 package examples.kotlin.spring.canonical
 
 import examples.kotlin.spring.canonical.AddressDynamicSqlSupport.Address
+import examples.kotlin.spring.canonical.GeneratedAlwaysDynamicSqlSupport.GeneratedAlways
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.addressId
 import examples.kotlin.spring.canonical.PersonDynamicSqlSupport.Person.birthDate
@@ -32,6 +33,8 @@ import org.mybatis.dynamic.sql.util.kotlin.spring.*
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
+import org.springframework.jdbc.support.GeneratedKeyHolder
+import org.springframework.jdbc.support.KeyHolder
 import java.util.*
 
 @Suppress("LargeClass", "MaxLineLength")
@@ -40,11 +43,13 @@ class CanonicalSpringKotlinTest {
 
     @BeforeEach
     fun setup() {
-        val db = EmbeddedDatabaseBuilder()
-            .setType(EmbeddedDatabaseType.HSQL)
-            .generateUniqueName(true)
-            .addScript("classpath:/examples/kotlin/spring/CreateSimpleDB.sql")
-            .build()
+        val db = EmbeddedDatabaseBuilder().run {
+            setType(EmbeddedDatabaseType.HSQL)
+            generateUniqueName(true)
+            addScript("classpath:/examples/kotlin/spring/CreateGeneratedAlwaysDB.sql")
+            addScript("classpath:/examples/kotlin/spring/CreateSimpleDB.sql")
+            build()
+        }
         template = NamedParameterJdbcTemplate(db)
     }
 
@@ -314,8 +319,19 @@ class CanonicalSpringKotlinTest {
         TODO()
     }
 
+    @Test
     fun testGeneralInsertWithGeneratedKey() {
-        TODO()
+        val insertStatement = insertInto(GeneratedAlways) {
+            set(GeneratedAlways.firstName).toValue("Fred")
+            set(GeneratedAlways.lastName).toValue("Flintstone")
+        }
+
+        val keyHolder = GeneratedKeyHolder()
+
+        val rows = template.insert(insertStatement, keyHolder)
+        assertThat(rows).isEqualTo(1)
+        assertThat(keyHolder.keys).containsEntry("ID", 22)
+        assertThat(keyHolder.keys).containsEntry("FULL_NAME", "Fred Flintstone")
     }
 
     fun testInsertWithGeneratedKey() {

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

@@ -0,0 +1,28 @@
+/**
+ *    Copyright 2016-2020 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package examples.kotlin.spring.canonical
+
+import org.mybatis.dynamic.sql.SqlTable
+import java.sql.JDBCType
+
+object GeneratedAlwaysDynamicSqlSupport {
+    object GeneratedAlways : SqlTable("GeneratedAlways") {
+        val id = column<Int>("id", JDBCType.INTEGER)
+        val firstName = column<String>("first_name", JDBCType.VARCHAR)
+        val lastName = column<String>("last_name", JDBCType.VARCHAR)
+        val fullName = column<String>("full_name", JDBCType.VARCHAR)
+    }
+}

src/test/resources/examples/kotlin/spring/CreateGeneratedAlwaysDB.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2016-2019 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+drop table GeneratedAlways if exists;
+
+create table GeneratedAlways (
+  id int generated by default as identity(start with 22),
+   first_name varchar(30) not null,
+   last_name varchar(30) not null,
+   full_name varchar(61) generated always as (first_name || ' ' || last_name),
+   primary key(id)
+);