feat: utility leftJoin/rightJoin/innerJoin functions on top of the join

dzikoysk · Oct 11, 2024 · ae57f26 · ae57f26
1 parent a98705d
commit ae57f26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/sqiffy-test/src/test/kotlin/com/dzikoysk/sqiffy/e2e/DslE2ETest.kt b/sqiffy-test/src/test/kotlin/com/dzikoysk/sqiffy/e2e/DslE2ETest.kt
@@ -119,7 +119,7 @@ internal abstract class DslE2ETest(
 
         val joinedData = database.select(UserTable)
             .distinct()
-            .join(INNER, UserTable.id, GuildTable.owner)
+            .innerJoin(UserTable.id, GuildTable.owner)
             .slice(UserTable.name, GuildTable.name)
             .where { GuildTable.owner eq insertedGuild.owner }
             .limit(1, offset = 0)

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
@@ -1,3 +1,5 @@
+@file:Suppress("MemberVisibilityCanBePrivate", "unused")
+
 package com.dzikoysk.sqiffy.dsl.statements
 
 import com.dzikoysk.sqiffy.SqiffyDatabase
@@ -57,6 +59,15 @@ open class SelectStatement(
         this.distinct = true
     }
 
+    fun <T> leftJoin(on: Column<T>, to: Column<T>): SelectStatement =
+        join(type = JoinType.LEFT, on = on, to = to)
+
+    fun <T> innerJoin(on: Column<T>, to: Column<T>): SelectStatement =
+        join(type = JoinType.INNER, on = on, to = to)
+
+    fun <T> rightJoin(on: Column<T>, to: Column<T>): SelectStatement =
+        join(type = JoinType.RIGHT, on = on, to = to)
+
     fun <T> join(type: JoinType, on: Column<T>, to: Column<T>): SelectStatement = also {
         val join = Join(type, on, to)
         require(!joins.contains(join)) { "Join $join is already defined" }