Refinements to the Fix for Kotlin

jeffgbutler · jeffgbutler · commit a67ef635931f · 2019-11-20T05:58:48.000-05:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java b/src/main/java/org/mybatis/dynamic/sql/delete/DeleteDSL.java
@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.delete;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.ToIntFunction;
@@ -51,6 +52,12 @@ public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition
         return whereBuilder;
     }
 
+    public <T> DeleteWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
+            List<SqlCriterion<?>> subCriteria) {
+        whereBuilder.where(column, condition, subCriteria);
+        return whereBuilder;
+    }
+
     @SuppressWarnings("unchecked")
     public DeleteWhereBuilder applyWhere(WhereApplier whereApplier) {
         return (DeleteWhereBuilder) whereApplier.apply(whereBuilder);
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/CountDSL.java
@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.select;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
 
@@ -57,6 +58,12 @@ public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<
         return whereBuilder;
     }
 
+    public <T> CountWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
+            List<SqlCriterion<?>> subCriteria) {
+        whereBuilder.where(column, condition, subCriteria);
+        return whereBuilder;
+    }
+
     @SuppressWarnings("unchecked")
     public CountWhereBuilder applyWhere(WhereApplier whereApplier) {
         return (CountWhereBuilder) whereApplier.apply(whereBuilder);
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java b/src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionDSL.java
@@ -69,6 +69,12 @@ public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, Visitable
         return whereBuilder;
     }
 
+    public <T> QueryExpressionWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
+            List<SqlCriterion<?>> subCriteria) {
+        whereBuilder.where(column, condition, subCriteria);
+        return whereBuilder;
+    }
+
     @SuppressWarnings("unchecked")
     public QueryExpressionWhereBuilder applyWhere(WhereApplier whereApplier) {
         return (QueryExpressionWhereBuilder) whereApplier.apply(whereBuilder);
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java b/src/main/java/org/mybatis/dynamic/sql/update/UpdateDSL.java
@@ -69,6 +69,12 @@ public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition
         return whereBuilder;
     }
 
+    public <T> UpdateWhereBuilder where(BindableColumn<T> column, VisitableCondition<T> condition,
+            List<SqlCriterion<?>> subCriteria) {
+        whereBuilder.where(column, condition, subCriteria);
+        return whereBuilder;
+    }
+
     @SuppressWarnings("unchecked")
     public UpdateWhereBuilder applyWhere(WhereApplier whereApplier) {
         return (UpdateWhereBuilder) whereApplier.apply(whereBuilder);
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinCountBuilder.kt
@@ -20,10 +20,11 @@ import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.select.CountDSL
 import org.mybatis.dynamic.sql.select.SelectModel
+import org.mybatis.dynamic.sql.util.Buildable
 
-typealias CountCompleter = KotlinCountBuilder.() -> KotlinCountBuilder
+typealias CountCompleter = KotlinCountBuilder.() -> Buildable<SelectModel>
 
-class KotlinCountBuilder(val dsl: CountDSL<SelectModel>) {
+class KotlinCountBuilder(private val dsl: CountDSL<SelectModel>): Buildable<SelectModel> {
     fun join(table: SqlTable, receiver: JoinReceiver) =
             apply {
                 val collector = JoinCollector()
@@ -89,8 +90,7 @@ class KotlinCountBuilder(val dsl: CountDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where(column, condition, *collector.criteria.toTypedArray())
+                dsl.where(column, condition, collector.criteria)
             }
 
     fun applyWhere(whereApplier: WhereApplier) =
@@ -107,8 +107,7 @@ class KotlinCountBuilder(val dsl: CountDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().and(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().and(column, condition, collector.criteria)
             }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -120,9 +119,10 @@ class KotlinCountBuilder(val dsl: CountDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().or(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().or(column, condition, collector.criteria)
             }
 
     fun allRows() = this
+
+    override fun build(): SelectModel = dsl.build()
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinDeleteBuilder.kt
@@ -19,10 +19,11 @@ import org.mybatis.dynamic.sql.BindableColumn
 import org.mybatis.dynamic.sql.VisitableCondition
 import org.mybatis.dynamic.sql.delete.DeleteDSL
 import org.mybatis.dynamic.sql.delete.DeleteModel
+import org.mybatis.dynamic.sql.util.Buildable
 
-typealias DeleteCompleter = KotlinDeleteBuilder.() -> KotlinDeleteBuilder
+typealias DeleteCompleter = KotlinDeleteBuilder.() -> Buildable<DeleteModel>
 
-class KotlinDeleteBuilder(val dsl: DeleteDSL<DeleteModel>) {
+class KotlinDeleteBuilder(private val dsl: DeleteDSL<DeleteModel>): Buildable<DeleteModel> {
     fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>) =
             apply {
                 dsl.where(column, condition)
@@ -32,8 +33,7 @@ class KotlinDeleteBuilder(val dsl: DeleteDSL<DeleteModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where(column, condition, *collector.criteria.toTypedArray())
+                dsl.where(column, condition, collector.criteria)
             }
 
     fun applyWhere(whereApplier: WhereApplier) =
@@ -50,8 +50,7 @@ class KotlinDeleteBuilder(val dsl: DeleteDSL<DeleteModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().and(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().and(column, condition, collector.criteria)
             }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -63,9 +62,10 @@ class KotlinDeleteBuilder(val dsl: DeleteDSL<DeleteModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().or(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().or(column, condition, collector.criteria)
             }
 
     fun allRows() = this
+
+    override fun build(): DeleteModel = dsl.build()
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinQueryBuilder.kt
@@ -18,10 +18,11 @@ package org.mybatis.dynamic.sql.util.kotlin
 import org.mybatis.dynamic.sql.*
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
 import org.mybatis.dynamic.sql.select.SelectModel
+import org.mybatis.dynamic.sql.util.Buildable
 
-typealias SelectCompleter = KotlinQueryBuilder.() -> KotlinQueryBuilder
+typealias SelectCompleter = KotlinQueryBuilder.() -> Buildable<SelectModel>
 
-class KotlinQueryBuilder(val dsl: QueryExpressionDSL<SelectModel>) {
+class KotlinQueryBuilder(private val dsl: QueryExpressionDSL<SelectModel>): Buildable<SelectModel> {
     fun join(table: SqlTable, receiver: JoinReceiver) =
             apply {
                 val collector = JoinCollector()
@@ -87,8 +88,7 @@ class KotlinQueryBuilder(val dsl: QueryExpressionDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where(column, condition, *collector.criteria.toTypedArray())
+                dsl.where(column, condition, collector.criteria)
             }
 
     fun applyWhere(whereApplier: WhereApplier) =
@@ -105,8 +105,7 @@ class KotlinQueryBuilder(val dsl: QueryExpressionDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().and(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().and(column, condition, collector.criteria)
             }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -118,8 +117,7 @@ class KotlinQueryBuilder(val dsl: QueryExpressionDSL<SelectModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().or(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().or(column, condition, collector.criteria)
             }
 
     fun groupBy(vararg columns: BasicColumn) =
@@ -148,4 +146,6 @@ class KotlinQueryBuilder(val dsl: QueryExpressionDSL<SelectModel>) {
             }
 
     fun allRows() = this
+
+    override fun build(): SelectModel = dsl.build()
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt
@@ -22,15 +22,16 @@ import org.mybatis.dynamic.sql.insert.InsertDSL
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
 import org.mybatis.dynamic.sql.update.UpdateDSL
 import org.mybatis.dynamic.sql.update.UpdateModel
+import org.mybatis.dynamic.sql.util.Buildable
 
 // insert completers are here because sonar doesn't see them as covered if they are in a file by themselves
 typealias InsertCompleter<T> = InsertDSL<T>.() -> InsertDSL<T>
 
 typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> MultiRowInsertDSL<T>
 
-typealias UpdateCompleter = KotlinUpdateBuilder.() -> KotlinUpdateBuilder
+typealias UpdateCompleter = KotlinUpdateBuilder.() -> Buildable<UpdateModel>
 
-class KotlinUpdateBuilder(val dsl: UpdateDSL<UpdateModel>) {
+class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) : Buildable<UpdateModel> {
     fun <T> where(column: BindableColumn<T>, condition: VisitableCondition<T>) =
             apply {
                 dsl.where(column, condition)
@@ -40,8 +41,7 @@ class KotlinUpdateBuilder(val dsl: UpdateDSL<UpdateModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where(column, condition, *collector.criteria.toTypedArray())
+                dsl.where(column, condition, collector.criteria)
             }
 
     fun applyWhere(whereApplier: WhereApplier) =
@@ -58,8 +58,7 @@ class KotlinUpdateBuilder(val dsl: UpdateDSL<UpdateModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().and(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().and(column, condition, collector.criteria)
             }
 
     fun <T> or(column: BindableColumn<T>, condition: VisitableCondition<T>) =
@@ -71,11 +70,12 @@ class KotlinUpdateBuilder(val dsl: UpdateDSL<UpdateModel>) {
             apply {
                 val collector = CriteriaCollector()
                 collect(collector)
-                // TODO...awkward
-                dsl.where().or(column, condition, *collector.criteria.toTypedArray())
+                dsl.where().or(column, condition, collector.criteria)
             }
 
     fun <T> set(column: SqlColumn<T>): UpdateDSL<UpdateModel>.SetClauseFinisher<T> {
         return dsl.set(column)
     }
+
+    override fun build(): UpdateModel = dsl.build()
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt
@@ -32,13 +32,13 @@ import org.mybatis.dynamic.sql.util.kotlin.*
 fun countFrom(table: SqlTable, completer: CountCompleter): SelectStatementProvider {
     val builder = KotlinCountBuilder(SqlBuilder.countFrom(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
 fun deleteFrom(table: SqlTable, completer: DeleteCompleter): DeleteStatementProvider {
     val builder = KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
 fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
@@ -50,23 +50,23 @@ fun <T> MultiRowInsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: Multi
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table, alias))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
 fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(start)
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
 fun update(table: SqlTable, completer: UpdateCompleter): UpdateStatementProvider {
     val builder = KotlinUpdateBuilder(SqlBuilder.update(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.MYBATIS3)
+    return builder.build().render(RenderingStrategies.MYBATIS3)
 }
diff --git a/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt b/src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/spring/ProviderBuilderFunctions.kt
@@ -30,13 +30,13 @@ import org.mybatis.dynamic.sql.util.kotlin.*
 fun countFrom(table: SqlTable, completer: CountCompleter): SelectStatementProvider {
     val builder = KotlinCountBuilder(SqlBuilder.countFrom(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
 
 fun deleteFrom(table: SqlTable, completer: DeleteCompleter): DeleteStatementProvider {
     val builder = KotlinDeleteBuilder(SqlBuilder.deleteFrom(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
 
 fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
@@ -45,23 +45,23 @@ fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertComplet
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
 
 fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table, alias))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
 
 fun select(start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter): SelectStatementProvider {
     val builder = KotlinQueryBuilder(start)
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
 
 fun update(table: SqlTable, completer: UpdateCompleter): UpdateStatementProvider {
     val builder = KotlinUpdateBuilder(SqlBuilder.update(table))
     completer(builder)
-    return builder.dsl.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
+    return builder.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER)
 }
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/canonical/PersonMapperTest.kt
@@ -308,6 +308,27 @@ class PersonMapperTest {
         }
     }
 
+    @Test
+    fun testUpdateOneFieldInAllRows() {
+        newSession().use { session ->
+            val mapper = session.getMapper(PersonMapper::class.java)
+
+            val record = PersonRecord(100, "Joe", LastName("Jones"), Date(), true, "Developer", 1)
+
+            var rows = mapper.insert(record)
+            assertThat(rows).isEqualTo(1)
+
+            rows = mapper.update {
+                set(occupation).equalTo("Programmer")
+            }
+
+            assertThat(rows).isEqualTo(7)
+
+            val newRecord = mapper.selectByPrimaryKey(100)
+            assertThat(newRecord?.occupation).isEqualTo("Programmer")
+        }
+    }
+
     @Test
     fun testUpdateAll() {
         newSession().use { session ->
diff --git a/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapperTest.kt b/src/test/kotlin/examples/kotlin/mybatis3/joins/JoinMapperTest.kt
