Kotlin SubQuery builders can implement Buildable

Author: jeffgbutler

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

@@ -96,7 +96,7 @@ abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, Select
     ) =
         applyJoin(joinCriteria) {
             val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().join(builder.selectBuilder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
+            getDsl().join(builder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
         }
 
     fun fullJoin(table: SqlTable, joinCriteria: JoinReceiver) =
@@ -115,7 +115,7 @@ abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, Select
     ) =
         applyJoin(joinCriteria) {
             val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().fullJoin(builder.selectBuilder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
+            getDsl().fullJoin(builder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
         }
 
     fun leftJoin(table: SqlTable, joinCriteria: JoinReceiver) =
@@ -134,7 +134,7 @@ abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, Select
     ) =
         applyJoin(joinCriteria) {
             val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().leftJoin(builder.selectBuilder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
+            getDsl().leftJoin(builder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
         }
 
     fun rightJoin(table: SqlTable, joinCriteria: JoinReceiver) =
@@ -153,7 +153,7 @@ abstract class KotlinBaseJoiningBuilder<T : AbstractQueryExpressionDSL<T, Select
     ) =
         applyJoin(joinCriteria) {
             val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            getDsl().rightJoin(builder.selectBuilder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
+            getDsl().rightJoin(builder, builder.correlationName, it.onJoinCriterion, it.andJoinCriteria)
         }
 
     private fun applyJoin(joinCriteria: JoinReceiver, block: (JoinCollector) -> Unit) =

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

@@ -25,25 +25,25 @@ import org.mybatis.dynamic.sql.where.condition.IsNotEqualToWithSubselect
 import org.mybatis.dynamic.sql.where.condition.IsNotInWithSubselect
 
 fun <T> isEqualTo(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isNotEqualTo(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsNotEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsNotEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isIn(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsInWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsInWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isNotIn(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsNotInWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsNotInWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isGreaterThan(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsGreaterThanWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsGreaterThanWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isGreaterThanOrEqualTo(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsGreaterThanOrEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsGreaterThanOrEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isLessThan(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsLessThanWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsLessThanWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))
 
 fun <T> isLessThanOrEqualTo(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
-    IsLessThanOrEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+    IsLessThanOrEqualToWithSubselect.of<T>(subQuery(KotlinSubQueryBuilder()))

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

@@ -52,7 +52,7 @@ object KotlinModelBuilderFunctions {
         with(completer(KotlinInsertSelectSubQueryBuilder())) {
             SqlBuilder.insertInto(table)
                 .withColumnList(columnList)
-                .withSelectStatement(selectBuilder)
+                .withSelectStatement(this)
                 .build()
         }
 

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

@@ -45,7 +45,7 @@ class KotlinSelectBuilder(private val fromGatherer: QueryExpressionDSL.FromGathe
     fun from(subQuery: KotlinQualifiedSubQueryBuilder.() -> KotlinQualifiedSubQueryBuilder) =
         apply {
             val builder = subQuery(KotlinQualifiedSubQueryBuilder())
-            dsl = fromGatherer.from(builder.selectBuilder, builder.correlationName)
+            dsl = fromGatherer.from(builder, builder.correlationName)
         }
 
     fun groupBy(vararg columns: BasicColumn) =

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

@@ -18,10 +18,12 @@ package org.mybatis.dynamic.sql.util.kotlin
 import org.mybatis.dynamic.sql.BasicColumn
 import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlColumn
+import org.mybatis.dynamic.sql.select.SelectModel
+import org.mybatis.dynamic.sql.util.Buildable
 
 @MyBatisDslMarker
-sealed class KotlinBaseSubQueryBuilder<T : KotlinBaseSubQueryBuilder<T> > {
-    lateinit var selectBuilder: KotlinSelectBuilder
+sealed class KotlinBaseSubQueryBuilder<T : KotlinBaseSubQueryBuilder<T>> : Buildable<SelectModel> {
+    private lateinit var selectBuilder: KotlinSelectBuilder
 
     fun select(vararg selectList: BasicColumn, completer: SelectCompleter) =
         select(selectList.toList(), completer)
@@ -39,6 +41,8 @@ sealed class KotlinBaseSubQueryBuilder<T : KotlinBaseSubQueryBuilder<T> > {
             selectBuilder = completer(KotlinSelectBuilder(SqlBuilder.selectDistinct(selectList)))
         }
 
+    override fun build() = selectBuilder.build()
+
     private fun applySelf(block: T.() -> Unit): T =
         self().apply { block() }
 

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

@@ -68,7 +68,7 @@ class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :
 
         fun equalToQueryResult(subQuery: KotlinSubQueryBuilder.() -> KotlinSubQueryBuilder) =
             applyToDsl {
-                set(column).equalTo(subQuery(KotlinSubQueryBuilder()).selectBuilder)
+                set(column).equalTo(subQuery(KotlinSubQueryBuilder()))
             }
 
         fun equalToWhenPresent(value: () -> T?) =