Better function name

Author: jeffgbutler

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

@@ -25,10 +25,10 @@ import org.mybatis.dynamic.sql.where.AbstractWhereSupport
 @DslMarker
 annotation class MyBatisDslMarker
 
-@Deprecated("Please use independentWhere")
+@Deprecated("Please use booleanExpression")
 typealias WhereApplier = KotlinBaseBuilder<*>.() -> Unit
 
-@Deprecated("Please use independentWhere")
+@Deprecated("Please use booleanExpression")
 fun WhereApplier.andThen(after: WhereApplier): WhereApplier = {
     invoke(this)
     after(this)
@@ -69,7 +69,7 @@ abstract class KotlinBaseBuilder<D : AbstractWhereSupport<*,*>> {
         getDsl().where().or(criteria)
     }
 
-    @Deprecated("Please create an independent where clause, then pass it to the \"where\" method")
+    @Deprecated("Please create a booleanExpression, then pass it to the \"where\" method")
     fun applyWhere(whereApplier: WhereApplier) = whereApplier.invoke(this)
 
     /**

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/elements/SqlElements.kt

@@ -78,10 +78,10 @@ import org.mybatis.dynamic.sql.where.condition.IsNotNull
 import org.mybatis.dynamic.sql.where.condition.IsNull
 
 /**
- * Simple function for code beautification. This allows creation of an independent where clause
+ * Function for code simplification. This allows creation of an independent where or having clause
  * that can be reused in different statements. For example:
  *
- * val whereClause = where { id isEqualTo 3 }
+ * val whereClause = booleanExpression { id isEqualTo 3 }
  *
  * val rows = countFrom(foo) {
  *   where(whereClause)
@@ -92,25 +92,7 @@ import org.mybatis.dynamic.sql.where.condition.IsNull
  * val whereClause: GroupingCriteriaReceiver = { id isEqualTo 3 }
  *
  */
-fun where(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
-
-/**
- * Simple function for code beautification. This allows creation of an independent having clause
- * that can be reused in different statements. For example:
- *
- * val havingClause = where { count() isGreaterThanTo 1 }
- *
- * val rows = select(id, count()) {
- *   from(foo)
- *   groupBy(id)
- *   having(havingClause)
- * }
- *
- * Use of this function is optional. You can also write code like this:
- *
- * val havingClause: GroupingCriteriaReceiver = { count() isGreaterThanTo 1 }
- */
-fun having(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
+fun booleanExpression(receiver: GroupingCriteriaReceiver): GroupingCriteriaReceiver = receiver
 
 // support for criteria without initial conditions
 fun and(receiver: GroupingCriteriaReceiver): AndOrCriteriaGroup =

src/test/kotlin/examples/kotlin/mybatis3/canonical/ReusableWhereTest.kt

@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.mybatis.dynamic.sql.util.kotlin.WhereApplier
 import org.mybatis.dynamic.sql.util.kotlin.andThen
-import org.mybatis.dynamic.sql.util.kotlin.elements.where
+import org.mybatis.dynamic.sql.util.kotlin.elements.booleanExpression
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -45,7 +45,7 @@ class ReusableWhereTest {
     }
 
     @Test
-    fun testCount() {
+    fun testCountWithDeprecatedClause() {
         sqlSessionFactory.openSession().use { session ->
             val mapper = session.getMapper(PersonMapper::class.java)
 
@@ -63,7 +63,7 @@ class ReusableWhereTest {
             val mapper = session.getMapper(PersonMapper::class.java)
 
             val rows = mapper.delete {
-                applyWhere(commonWhere)
+                where(commonWhereClause)
             }
 
             assertThat(rows).isEqualTo(3)
@@ -76,7 +76,7 @@ class ReusableWhereTest {
             val mapper = session.getMapper(PersonMapper::class.java)
 
             val rows = mapper.select {
-                applyWhere(commonWhere)
+                where(commonWhereClause)
                 orderBy(id)
             }
 
@@ -91,7 +91,7 @@ class ReusableWhereTest {
 
             val rows = mapper.update {
                 set(occupation) equalToStringConstant "worker"
-                applyWhere(commonWhere)
+                where(commonWhereClause)
             }
 
             assertThat(rows).isEqualTo(3)
@@ -145,7 +145,7 @@ class ReusableWhereTest {
         or { occupation.isNull() }
     }
 
-    private val commonWhereClause = where {
+    private val commonWhereClause = booleanExpression {
         id isEqualTo 1
         or { occupation.isNull() }
     }

src/test/kotlin/examples/kotlin/mybatis3/general/KGroupingTest.kt

@@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.exception.InvalidSqlException
 import org.mybatis.dynamic.sql.util.kotlin.elements.add
+import org.mybatis.dynamic.sql.util.kotlin.elements.booleanExpression
 import org.mybatis.dynamic.sql.util.kotlin.elements.column
 import org.mybatis.dynamic.sql.util.kotlin.elements.count
-import org.mybatis.dynamic.sql.util.kotlin.elements.having
 import org.mybatis.dynamic.sql.util.kotlin.elements.isBetween
 import org.mybatis.dynamic.sql.util.kotlin.elements.isLessThanOrEqualTo
 import org.mybatis.dynamic.sql.util.kotlin.mybatis3.select
@@ -363,7 +363,7 @@ class KGroupingTest {
 
     @Test
     fun testIndependentHaving() {
-        val havingClause = having { count() isGreaterThan 6 }
+        val havingClause = booleanExpression { count() isGreaterThan 6 }
 
         val selectStatement = select(A, count()) {
             from(foo)