Insert completers are not specific to MyBatis

Author: jeffgbutler

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

@@ -0,0 +1,7 @@
+package org.mybatis.dynamic.sql.util.kotlin
+
+import org.mybatis.dynamic.sql.insert.InsertDSL
+import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
+
+typealias InsertCompleter<T> = InsertDSL<T>.() -> InsertDSL<T>
+typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> MultiRowInsertDSL<T>

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

@@ -18,20 +18,12 @@ package org.mybatis.dynamic.sql.util.kotlin.mybatis3
 import org.mybatis.dynamic.sql.BasicColumn
 import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlTable
-import org.mybatis.dynamic.sql.insert.InsertDSL
-import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
 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
-import org.mybatis.dynamic.sql.util.kotlin.CountCompleter
-import org.mybatis.dynamic.sql.util.kotlin.DeleteCompleter
-import org.mybatis.dynamic.sql.util.kotlin.SelectCompleter
-import org.mybatis.dynamic.sql.util.kotlin.UpdateCompleter
-
-typealias InsertCompleter<T> = InsertDSL<T>.() -> InsertDSL<T>
-typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> MultiRowInsertDSL<T>
+import org.mybatis.dynamic.sql.util.kotlin.*
 
 fun count(table: SqlTable, completer: CountCompleter) =
     completer(SqlBuilder.countFrom(table)).build().render(RenderingStrategies.MYBATIS3)
@@ -45,11 +37,11 @@ fun <T> insert(record: T, table: SqlTable, completer: InsertCompleter<T>): Inser
 fun <T> insertMultiple(records: Collection<T>, table: SqlTable, completer: MultiRowInsertCompleter<T>): MultiRowInsertStatementProvider<T> =
     completer(SqlBuilder.insertMultiple(records).into(table)).build().render(RenderingStrategies.MYBATIS3)
 
-fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, complete: SelectCompleter) =
-    complete(from(table)).build().render(RenderingStrategies.MYBATIS3)
+fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter) =
+    completer(from(table)).build().render(RenderingStrategies.MYBATIS3)
 
-fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, complete: SelectCompleter) =
-    complete(from(table, alias)).build().render(RenderingStrategies.MYBATIS3)
+fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter) =
+    completer(from(table, alias)).build().render(RenderingStrategies.MYBATIS3)
 
 fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter) =
     completer(start).build().render(RenderingStrategies.MYBATIS3)