GH-81 Modify join slices

dzikoysk · Nov 8, 2024 · 072083c · 072083c
1 parent cc08be0
commit 072083c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/Expression.kt b/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/Expression.kt
@@ -10,8 +10,12 @@ sealed interface Expression<SOURCE, RESULT>
 
 sealed interface Condition<SOURCE> : Expression<SOURCE, Boolean>
 
+/* Const expressions */
+
 class ConstExpression<T>(val value: T) : Expression<T, T>
 
+fun const(value: String): ConstExpression<String> = ConstExpression(value)
+
 /* Math operators */
 
 enum class MathOperator(val symbol: String) {

diff --git a/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/statements/SelectStatement.kt b/sqiffy/src/main/kotlin/com/dzikoysk/sqiffy/dsl/statements/SelectStatement.kt
@@ -89,7 +89,7 @@ open class SelectStatement(
         val join = Join(type, table, mappedConditions.map { JoinCondition(on = it.first, toExpression = it.second) })
         require(!joins.contains(join)) { "Join $join is already defined" }
         joins.add(join)
-        slice.addAll(joinedToColumns.flatMap { it.table.getColumns() })
+        slice.addAll(table.getColumns())
     }
 
     fun slice(vararg selectables: Selectable): SelectStatement = also {
@@ -100,6 +100,14 @@ open class SelectStatement(
         this.slice = selectables.toMutableList()
     }
 
+    fun extendSlice(vararg selectables: Selectable): SelectStatement = also {
+        this.slice.addAll(selectables)
+    }
+
+    fun extendSlice(selectables: Collection<Selectable>): SelectStatement = also {
+        this.slice.addAll(selectables)
+    }
+
     fun where(where: () -> Expression<out Column<*>, Boolean>): SelectStatement = also {
         require(this.where == null) { "Where clause is already defined" }
         this.where = where()