DOPE-212: fixed merge

ergon · May 15, 2024 · 6bfa738 · 6bfa738
1 parent 18044b8
commit 6bfa738
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 18 deletions.
diff --git a/core/src/main/kotlin/ch/ergon/dope/resolvable/QueryStringBuilder.kt b/core/src/main/kotlin/ch/ergon/dope/resolvable/QueryStringBuilder.kt
@@ -6,8 +6,8 @@ fun formatToQueryString(left: String, vararg right: String) =
 fun formatMinimumTwoToQueryString(left: String, symbol: String, vararg right: String) =
     "$left $symbol ${right.joinToString()}"
 
-fun formatToQueryString(symbol: String, separator: String, vararg argument: String) =
-    "$symbol$separator${argument.joinToString(separator = ", ")}}"
+fun formatToQueryStringWithSeparator(symbol: String, separator: String, vararg argument: String) =
+    "$symbol$separator${argument.joinToString(separator = ", ")}"
 
 fun formatToQueryStringWithBrackets(left: String, symbol: String, right: String) = "($left $symbol $right)"
 fun formatToQueryStringWithBrackets(symbol: String, vararg argument: String) =

diff --git a/core/src/main/kotlin/ch/ergon/dope/resolvable/clause/model/UnnestClause.kt b/core/src/main/kotlin/ch/ergon/dope/resolvable/clause/model/UnnestClause.kt
@@ -1,22 +1,37 @@
 package ch.ergon.dope.resolvable.clause.model
 
+import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.resolvable.clause.ISelectUnnestClause
 import ch.ergon.dope.resolvable.expression.AliasedExpression
 import ch.ergon.dope.resolvable.expression.unaliased.type.Field
-import ch.ergon.dope.resolvable.formatToQueryString
+import ch.ergon.dope.resolvable.formatMinimumTwoToQueryString
 import ch.ergon.dope.validtype.ArrayType
 import ch.ergon.dope.validtype.ValidType
 
 private const val UNNEST = "UNNEST"
 
 class UnnestClause<T : ValidType>(private val arrayTypeField: Field<ArrayType<T>>, private val parentClause: ISelectUnnestClause) :
     ISelectUnnestClause {
-    override fun toQueryString(): String = formatToQueryString(parentClause, UNNEST, arrayTypeField)
+    override fun toQuery(): DopeQuery {
+        val parentDopeQuery = parentClause.toQuery()
+        val arrayTypeDopeQuery = arrayTypeField.toQuery()
+        return DopeQuery(
+            queryString = formatMinimumTwoToQueryString(parentDopeQuery.queryString, UNNEST, arrayTypeDopeQuery.queryString),
+            parameters = parentDopeQuery.parameters + arrayTypeDopeQuery.parameters,
+        )
+    }
 }
 
 class AliasedUnnestClause<T : ValidType>(
     private val aliasedExpression: AliasedExpression<ArrayType<T>>,
     private val parentClause: ISelectUnnestClause,
 ) : ISelectUnnestClause {
-    override fun toQueryString(): String = formatToQueryString(parentClause, UNNEST, aliasedExpression)
+    override fun toQuery(): DopeQuery {
+        val parentDopeQuery = parentClause.toQuery()
+        val aliasedExpressionDopeQuery = aliasedExpression.toQuery()
+        return DopeQuery(
+            queryString = formatMinimumTwoToQueryString(parentDopeQuery.queryString, UNNEST, aliasedExpressionDopeQuery.queryString),
+            parameters = parentDopeQuery.parameters + aliasedExpressionDopeQuery.parameters,
+        )
+    }
 }
diff --git a/core/src/main/kotlin/ch/ergon/dope/resolvable/expression/AliasedExpression.kt b/core/src/main/kotlin/ch/ergon/dope/resolvable/expression/AliasedExpression.kt
@@ -4,7 +4,7 @@ import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.resolvable.expression.unaliased.type.toBooleanType
 import ch.ergon.dope.resolvable.expression.unaliased.type.toNumberType
 import ch.ergon.dope.resolvable.expression.unaliased.type.toStringType
-import ch.ergon.dope.resolvable.formatToQueryString
+import ch.ergon.dope.resolvable.formatMinimumTwoToQueryString
 import ch.ergon.dope.validtype.ValidType
 
 class AliasedExpression<T : ValidType>(
@@ -14,7 +14,7 @@ class AliasedExpression<T : ValidType>(
     override fun toQuery(): DopeQuery {
         val unaliasedExpressionDopeQuery = unaliasedExpression.toQuery()
         return DopeQuery(
-            queryString = formatToQueryString(unaliasedExpressionDopeQuery.queryString, "AS", alias),
+            queryString = formatMinimumTwoToQueryString(unaliasedExpressionDopeQuery.queryString, "AS", alias),
             parameters = unaliasedExpressionDopeQuery.parameters,
         )
     }

diff --git a/core/src/main/kotlin/ch/ergon/dope/resolvable/operator/InfixOperator.kt b/core/src/main/kotlin/ch/ergon/dope/resolvable/operator/InfixOperator.kt
@@ -2,7 +2,7 @@ package ch.ergon.dope.resolvable.operator
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.resolvable.expression.TypeExpression
-import ch.ergon.dope.resolvable.formatToQueryString
+import ch.ergon.dope.resolvable.formatMinimumTwoToQueryString
 import ch.ergon.dope.resolvable.formatToQueryStringWithBrackets
 import ch.ergon.dope.validtype.ValidType
 
@@ -21,7 +21,7 @@ open class InfixOperator(
             )
         } else {
             DopeQuery(
-                queryString = formatToQueryString(leftDopeQuery.queryString, symbol, rightDopeQuery.queryString),
+                queryString = formatMinimumTwoToQueryString(leftDopeQuery.queryString, symbol, rightDopeQuery.queryString),
                 parameters = leftDopeQuery.parameters + rightDopeQuery.parameters,
             )
         }

diff --git a/core/src/main/kotlin/ch/ergon/dope/resolvable/operator/PrefixOperator.kt b/core/src/main/kotlin/ch/ergon/dope/resolvable/operator/PrefixOperator.kt
@@ -2,13 +2,13 @@ package ch.ergon.dope.resolvable.operator
 
 import ch.ergon.dope.DopeQuery
 import ch.ergon.dope.resolvable.Resolvable
-import ch.ergon.dope.resolvable.formatToQueryString
+import ch.ergon.dope.resolvable.formatToQueryStringWithSeparator
 
 open class PrefixOperator(private val symbol: String, private val argument: Resolvable) {
     fun toPrefixQueryString(separator: String): DopeQuery {
         val argumentDopeQuery = argument.toQuery()
         return DopeQuery(
-            queryString = formatToQueryString(symbol, separator = separator, argumentDopeQuery.queryString),
+            queryString = formatToQueryStringWithSeparator(symbol, separator = separator, argumentDopeQuery.queryString),
             parameters = argumentDopeQuery.parameters,
         )
     }

diff --git a/core/src/test/kotlin/ch/ergon/dope/BooleanComparatorTest.kt b/core/src/test/kotlin/ch/ergon/dope/BooleanComparatorTest.kt
@@ -884,7 +884,7 @@ class BooleanComparatorTest {
             .where(
                 true.toBooleanType().and(true),
             )
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }
@@ -900,7 +900,7 @@ class BooleanComparatorTest {
             .where(
                 true.toBooleanType().and(true).or(false),
             )
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }
@@ -916,7 +916,7 @@ class BooleanComparatorTest {
             .where(
                 true.toBooleanType().and(true.toBooleanType().or(false)),
             )
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }

diff --git a/core/src/test/kotlin/ch/ergon/dope/UnnestClauseTest.kt b/core/src/test/kotlin/ch/ergon/dope/UnnestClauseTest.kt
@@ -38,7 +38,7 @@ class UnnestClauseTest {
         val actual: String = create
             .selectFrom(airline)
             .unnest(alias)
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }
@@ -51,7 +51,7 @@ class UnnestClauseTest {
             .select(someNumberArrayField("c"))
             .from(someBucket("airline"))
             .unnest(someNumberArrayField("a"))
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }
@@ -68,7 +68,7 @@ class UnnestClauseTest {
             .unnest(aField.alias("ab"))
             .unnest(someBooleanArrayField("c", someBucket("ab")))
             .where(aField.isValued())
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }
@@ -87,7 +87,7 @@ class UnnestClauseTest {
                 someStringField(bucket = b).isEqualTo("something")
                     .and(someStringField(bucket = someBucket("a")).isEqualTo("".asParameter("param"))),
             )
-            .build()
+            .build().queryString
 
         assertEquals(expected, actual)
     }