Update JoinClauseMixin to support more ANSI SQL joins (#616)

* Update JoinClauseMixin Add Ansi join operators RIGHT and FULL Also LATERAL modifier These are added as forward declarations in the SqlLexer.flex that are needed for dialects to override Keep core grammar with LEFT join This allows the existing dialects to work with LEFT join and enables dialects to add RIGHT, FULL where supported, e.g PostgreSql and latest Sqlite dialect * Remove LATERAL LATERAL keyword is used as table/subquery and join operation. Needs special handling
sqldelight · Mar 27, 2024 · 5c953c5 · 5c953c5
1 parent 6ea26b9
commit 5c953c5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlLexer.flex b/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlLexer.flex
@@ -185,6 +185,8 @@ STRING=('([^'])*'|\"([^\"])*\")
   "INDEXED"              { return INDEXED; }
   "NATURAL"              { return NATURAL; }
   "LEFT"                 { return LEFT; }
+  "RIGHT"                { return RIGHT; }
+  "FULL"                 { return FULL; }
   "OUTER"                { return OUTER; }
   "INNER"                { return INNER; }
   "CROSS"                { return CROSS; }

diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/JoinClauseMixin.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/psi/mixins/JoinClauseMixin.kt
@@ -5,10 +5,12 @@ import com.alecstrong.sql.psi.core.psi.QueryElement.QueryResult
 import com.alecstrong.sql.psi.core.psi.SqlCompositeElementImpl
 import com.alecstrong.sql.psi.core.psi.SqlJoinClause
 import com.alecstrong.sql.psi.core.psi.SqlJoinConstraint
+import com.alecstrong.sql.psi.core.psi.SqlJoinOperator
 import com.alecstrong.sql.psi.core.psi.SqlTypes
 import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
+import com.intellij.psi.tree.TokenSet
 
 internal abstract class JoinClauseMixin(
   node: ASTNode,
@@ -61,10 +63,7 @@ internal abstract class JoinClauseMixin(
               var columns = query.flatMap { it.columns }
               var synthesizedColumns = query.flatMap { it.synthesizedColumns }
 
-              if (operator.node.findChildByType(
-                  SqlTypes.LEFT,
-                ) != null
-              ) {
+              if (supportsJoinOperator(operator)) {
                 columns = columns.map { it.copy(nullable = true) }
                 synthesizedColumns = synthesizedColumns.map { it.copy(nullable = true) }
               }
@@ -90,5 +89,15 @@ internal abstract class JoinClauseMixin(
     return@ModifiableFileLazy queryAvailable
   }
 
+  private fun supportsJoinOperator(operator: SqlJoinOperator): Boolean {
+    return operator.node.findChildByType(
+      TokenSet.create(
+        SqlTypes.LEFT_JOIN_OPERATOR,
+        SqlTypes.RIGHT_JOIN_OPERATOR,
+        SqlTypes.FULL_JOIN_OPERATOR,
+      ),
+    ) != null
+  }
+
   override fun queryExposed() = queryExposed.forFile(containingFile)
 }
diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/sql.bnf b/core/src/main/kotlin/com/alecstrong/sql/psi/core/sql.bnf
@@ -383,8 +383,13 @@ result_column ::= ( MULTIPLY
     "com.alecstrong.sql.psi.core.psi.SqlCompositeElement"
   ]
 }
+
+left_join_operator ::= LEFT
+right_join_operator ::= RIGHT
+full_join_operator ::= FULL
+
 join_operator ::= ( COMMA
-                  | [ NATURAL ] [ LEFT [ OUTER ] | INNER | CROSS ] JOIN )
+                  | [ NATURAL ] [ left_join_operator [ OUTER ] | INNER | CROSS ] JOIN )
 join_constraint ::= [ ON expr | USING LP column_name ( COMMA column_name ) * RP ]
 ordering_term ::= expr [ COLLATE collation_name ] [ ASC | DESC ] {
   mixin = "com.alecstrong.sql.psi.core.psi.mixins.OrderByMixin"