Add Template extensions that further simplify Spring usage

Author: jeffgbutler

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

@@ -15,28 +15,72 @@
  */
 package org.mybatis.dynamic.sql.util.kotlin.spring
 
+import org.mybatis.dynamic.sql.BasicColumn
+import org.mybatis.dynamic.sql.SqlBuilder
+import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider
+import org.mybatis.dynamic.sql.util.kotlin.*
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import java.sql.ResultSet
 
 fun NamedParameterJdbcTemplate.count(selectStatement: SelectStatementProvider) =
     queryForObject(selectStatement.selectStatement, selectStatement.parameters, Long::class.java)!!
 
+fun NamedParameterJdbcTemplate.count(table: SqlTable, completer: CountCompleter) =
+    count(org.mybatis.dynamic.sql.util.kotlin.spring.count(table, completer))
+
 fun NamedParameterJdbcTemplate.delete(deleteStatement: DeleteStatementProvider) =
     update(deleteStatement.deleteStatement, deleteStatement.parameters)
 
+fun NamedParameterJdbcTemplate.deleteFrom(table: SqlTable, completer: DeleteCompleter) =
+    delete(org.mybatis.dynamic.sql.util.kotlin.spring.deleteFrom(table, completer))
+
 fun <T> NamedParameterJdbcTemplate.insert(insertStatement: InsertStatementProvider<T>) =
     update(insertStatement.insertStatement, BeanPropertySqlParameterSource(insertStatement.record))
 
-fun <T> NamedParameterJdbcTemplate.selectMany(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): List<T> =
+fun <T> NamedParameterJdbcTemplate.insert(record: T, table: SqlTable, completer: InsertCompleter<T>) =
+    insert(org.mybatis.dynamic.sql.util.kotlin.spring.insert(record, table, completer))
+
+fun NamedParameterJdbcTemplate.select(vararg selectList: BasicColumn) =
+    FromGatherer(selectList.toList(), this)
+
+fun NamedParameterJdbcTemplate.selectDistinct(vararg selectList: BasicColumn) =
+    DistinctFromGatherer(selectList.toList(), this)
+
+fun <T> NamedParameterJdbcTemplate.selectList(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): List<T> =
     query(selectStatement.selectStatement, selectStatement.parameters, rowMapper)
 
 fun <T> NamedParameterJdbcTemplate.selectOne(selectStatement: SelectStatementProvider, rowMapper: (rs: ResultSet, rowNum: Int) -> T): T? =
     queryForObject(selectStatement.selectStatement, selectStatement.parameters, rowMapper)
 
 fun NamedParameterJdbcTemplate.update(updateStatement: UpdateStatementProvider) =
     update(updateStatement.updateStatement, updateStatement.parameters)
+
+fun NamedParameterJdbcTemplate.update(table: SqlTable, completer: UpdateCompleter) =
+    update(org.mybatis.dynamic.sql.util.kotlin.spring.update(table, completer))
+
+// support classes for select DSL
+class FromGatherer(private val selectList: List<BasicColumn>, private val template: NamedParameterJdbcTemplate) {
+    fun from(table: SqlTable, completer: SelectCompleter) =
+        MapperGatherer(SqlBuilder.select(selectList).from(table, completer), template)
+
+    fun from(table: SqlTable, alias: String, completer: SelectCompleter) =
+        MapperGatherer(SqlBuilder.select(selectList).from(table, alias, completer), template)
+}
+
+class DistinctFromGatherer(private val selectList: List<BasicColumn>, private val template: NamedParameterJdbcTemplate) {
+    fun from(table: SqlTable, completer: SelectCompleter) =
+        MapperGatherer(SqlBuilder.selectDistinct(selectList).from(table, completer), template)
+
+    fun from(table: SqlTable, alias: String, completer: SelectCompleter) =
+        MapperGatherer(SqlBuilder.selectDistinct(selectList).from(table, alias, completer), template)
+}
+
+class MapperGatherer(private val selectStatement: SelectStatementProvider, private val template: NamedParameterJdbcTemplate) {
+    fun <T> withRowMapper(rowMapper: (rs: ResultSet, rowNum: Int) -> T) =
+        template.selectList(selectStatement, rowMapper)
+}

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

@@ -18,7 +18,6 @@ package org.mybatis.dynamic.sql.util.kotlin.spring
 import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
-import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider
 import org.mybatis.dynamic.sql.render.RenderingStrategies
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel

src/site/markdown/docs/kotlinMyBatis3.md

@@ -3,7 +3,7 @@ MyBatis Dynamic SQL includes Kotlin extension methods that enable an SQL DSL for
 
 The standard usage patterns for MyBatis Dynamic SQL and MyBatis3 in Java must be modified somewhat for Kotlin. Kotlin interfaces can contain both abstract and non-abstract methods (somewhat similar to Java's default methods in an interface). But using these methods in Kotlin based mapper interfaces will cause a failure with MyBatis because of the underlying Kotlin implementation.
 
-This page will show our recommended pattern for using the MyBatis Dynamic SQL with Kotlin. The code shown on this page is from the `src/test/kotlin/examples/kotlin/mybatis3/canonical` directory in this repository. That directory contains a complete example of using this library with Kotlin.
+This page will show our recommended pattern for using the MyBatis Dynamic SQL with Kotlin and MyBatis3. The code shown on this page is from the `src/test/kotlin/examples/kotlin/mybatis3/canonical` directory in this repository. That directory contains a complete example of using this library with Kotlin.
 
 All Kotlin support is available in two packages: