Fix the awkward single row insert for Kotlin

Author: jeffgbutler

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

@@ -24,6 +24,7 @@ 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
@@ -40,3 +41,8 @@ class MultiRowInsertHelper<T>(private val records: List<T>, private val template
         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

@@ -33,6 +33,7 @@ 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.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
@@ -57,18 +58,28 @@ fun NamedParameterJdbcTemplate.delete(deleteStatement: DeleteStatementProvider)
 fun NamedParameterJdbcTemplate.deleteFrom(table: SqlTable, completer: DeleteCompleter) =
     delete(org.mybatis.dynamic.sql.util.kotlin.spring.deleteFrom(table, completer))
 
+// single record insert
 fun <T> NamedParameterJdbcTemplate.insert(insertStatement: InsertStatementProvider<T>) =
     update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement.record))
 
+fun <T> NamedParameterJdbcTemplate.insert(record: T) =
+    SingleRowInsertHelper(record, this)
+
+@Deprecated(
+    message = "Deprecated for being awkward and inconsistent",
+    replaceWith = ReplaceWith("insert(record).into(table, completer)")
+)
 fun <T> NamedParameterJdbcTemplate.insert(record: T, table: SqlTable, completer: InsertCompleter<T>) =
     insert(SqlBuilder.insert(record).into(table, completer))
 
+// general insert
 fun NamedParameterJdbcTemplate.insert(insertStatement: GeneralInsertStatementProvider) =
     update(insertStatement.insertStatement, insertStatement.parameters)
 
 fun NamedParameterJdbcTemplate.insertInto(table: SqlTable, completer: GeneralInsertCompleter) =
     insert(org.mybatis.dynamic.sql.util.kotlin.spring.insertInto(table, completer))
 
+// multiple record insert
 fun <T> NamedParameterJdbcTemplate.insertMultiple(vararg records: T) =
     insertMultiple(records.asList())
 

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

@@ -158,7 +158,7 @@ class CanonicalSpringKotlinTemplateDirectTest {
     }
 
     @Test
-    fun testInsert() {
+    fun testDeprecatedInsert() {
         val record = PersonRecord(100, "Joe", LastName("Jones"), Date(), true, "Developer", 1)
 
         val rows = template.insert(record, Person) {
@@ -174,6 +174,23 @@ class CanonicalSpringKotlinTemplateDirectTest {
         assertThat(rows).isEqualTo(1)
     }
 
+    @Test
+    fun testInsert() {
+        val record = PersonRecord(100, "Joe", LastName("Jones"), Date(), true, "Developer", 1)
+
+        val rows = template.insert(record).into(Person) {
+            map(id).toProperty("id")
+            map(firstName).toProperty("firstName")
+            map(lastName).toProperty("lastNameAsString")
+            map(birthDate).toProperty("birthDate")
+            map(employed).toProperty("employedAsString")
+            map(occupation).toPropertyWhenPresent("occupation", record::occupation)
+            map(addressId).toProperty("addressId")
+        }
+
+        assertThat(rows).isEqualTo(1)
+    }
+
     @Test
     fun testGeneralInsert() {
         val rows = template.insertInto(Person) {