Select DSL functions are Unit functions

Author: jeffgbutler

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

@@ -147,7 +147,7 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*>> {
 
     fun allRows() {}
 
-    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit): Unit {
+    private fun applyToWhere(block: AbstractWhereDSL<*>.() -> Unit) {
         getDsl().where().apply(block)
     }
 

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

@@ -30,56 +30,44 @@ class KotlinSelectBuilder(private val fromGatherer: QueryExpressionDSL.FromGathe
 
     private lateinit var dsl: QueryExpressionDSL<SelectModel>
 
-    fun from(table: SqlTable): KotlinSelectBuilder =
-        apply {
-            dsl = fromGatherer.from(table)
-        }
+    fun from(table: SqlTable) {
+        dsl = fromGatherer.from(table)
+    }
 
-    fun from(table: SqlTable, alias: String): KotlinSelectBuilder =
-        apply {
-            dsl = fromGatherer.from(table, alias)
-        }
+    fun from(table: SqlTable, alias: String) {
+        dsl = fromGatherer.from(table, alias)
+    }
 
-    fun from(subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit): KotlinSelectBuilder =
-        apply {
-            val builder = KotlinQualifiedSubQueryBuilder().apply(subQuery)
-            dsl = fromGatherer.from(builder, builder.correlationName)
-        }
+    fun from(subQuery: KotlinQualifiedSubQueryBuilder.() -> Unit) {
+        val builder = KotlinQualifiedSubQueryBuilder().apply(subQuery)
+        dsl = fromGatherer.from(builder, builder.correlationName)
+    }
 
-    fun groupBy(vararg columns: BasicColumn): KotlinSelectBuilder =
-        apply {
-            getDsl().groupBy(columns.toList())
-        }
+    fun groupBy(vararg columns: BasicColumn) {
+        getDsl().groupBy(columns.toList())
+    }
 
-    fun orderBy(vararg columns: SortSpecification): KotlinSelectBuilder =
-        apply {
-            getDsl().orderBy(columns.toList())
-        }
+    fun orderBy(vararg columns: SortSpecification) {
+        getDsl().orderBy(columns.toList())
+    }
 
-    fun limit(limit: Long): KotlinSelectBuilder =
-        apply {
-            getDsl().limit(limit)
-        }
+    fun limit(limit: Long) {
+        getDsl().limit(limit)
+    }
 
-    fun offset(offset: Long): KotlinSelectBuilder =
-        apply {
-            getDsl().offset(offset)
-        }
+    fun offset(offset: Long) {
+        getDsl().offset(offset)
+    }
 
-    fun fetchFirst(fetchFirstRows: Long): KotlinSelectBuilder =
-        apply {
-            getDsl().fetchFirst(fetchFirstRows).rowsOnly()
-        }
+    fun fetchFirst(fetchFirstRows: Long) {
+        getDsl().fetchFirst(fetchFirstRows).rowsOnly()
+    }
 
-    fun union(union: KotlinUnionBuilder.() -> Unit): KotlinSelectBuilder =
-        apply {
-            union(KotlinUnionBuilder(getDsl().union()))
-        }
+    fun union(union: KotlinUnionBuilder.() -> Unit): Unit =
+        union(KotlinUnionBuilder(getDsl().union()))
 
-    fun unionAll(unionAll: KotlinUnionBuilder.() -> Unit): KotlinSelectBuilder =
-        apply {
-            unionAll(KotlinUnionBuilder(getDsl().unionAll()))
-        }
+    fun unionAll(unionAll: KotlinUnionBuilder.() -> Unit): Unit =
+        unionAll(KotlinUnionBuilder(getDsl().unionAll()))
 
     override fun build(): SelectModel = getDsl().build()