Fix SqlDialect (and InternalSD) parens for set ops

partiql · Jul 12, 2024 · c69dd6f · c69dd6f
1 parent 0bd0572
commit c69dd6f
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 0 deletions.
diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/sql/SqlDialect.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/sql/SqlDialect.kt
@@ -64,6 +64,13 @@ public abstract class SqlDialect : AstBaseVisitor<SqlBlock, SqlBlock>() {
             h = h concat ")"
             h
         }
+        is Expr.BagOp -> {
+            var h = head
+            h = h concat "("
+            h = visitExprBagOp(node, h)
+            h = h concat ")"
+            h
+        }
         else -> visitExpr(node, head)
     }
 

diff --git a/partiql-ast/src/main/kotlin/org/partiql/ast/sql/internal/InternalSqlDialect.kt b/partiql-ast/src/main/kotlin/org/partiql/ast/sql/internal/InternalSqlDialect.kt
@@ -82,6 +82,13 @@ internal abstract class InternalSqlDialect : AstBaseVisitor<InternalSqlBlock, In
             t = t concat ")"
             t
         }
+        is Expr.BagOp -> {
+            var t = tail
+            t = t concat "("
+            t = visitExprBagOp(node, t)
+            t = t concat ")"
+            t
+        }
         else -> visitExpr(node, tail)
     }
 

diff --git a/partiql-ast/src/test/kotlin/org/partiql/ast/sql/SqlDialectTest.kt b/partiql-ast/src/test/kotlin/org/partiql/ast/sql/SqlDialectTest.kt
@@ -986,6 +986,120 @@ class SqlDialectTest {
                     rhs = v("y")
                 }
             },
+            expect("(x UNION y) UNION z") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.UNION
+                        setq = null
+                    }
+                    outer = false
+                    lhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.UNION
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("x")
+                        rhs = v("y")
+                    }
+                    rhs = v("z")
+                }
+            },
+            expect("x UNION (y UNION z)") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.UNION
+                        setq = null
+                    }
+                    outer = false
+                    lhs = v("x")
+                    rhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.UNION
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("y")
+                        rhs = v("z")
+                    }
+                }
+            },
+            expect("(x EXCEPT y) EXCEPT z") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.EXCEPT
+                        setq = null
+                    }
+                    outer = false
+                    lhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.EXCEPT
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("x")
+                        rhs = v("y")
+                    }
+                    rhs = v("z")
+                }
+            },
+            expect("x EXCEPT (y EXCEPT z)") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.EXCEPT
+                        setq = null
+                    }
+                    outer = false
+                    lhs = v("x")
+                    rhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.EXCEPT
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("y")
+                        rhs = v("z")
+                    }
+                }
+            },
+            expect("(x INTERSECT y) INTERSECT z") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.INTERSECT
+                        setq = null
+                    }
+                    outer = false
+                    lhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.INTERSECT
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("x")
+                        rhs = v("y")
+                    }
+                    rhs = v("z")
+                }
+            },
+            expect("x INTERSECT (y INTERSECT z)") {
+                exprBagOp {
+                    type = setOp {
+                        type = SetOp.Type.INTERSECT
+                        setq = null
+                    }
+                    outer = false
+                    lhs = v("x")
+                    rhs = exprBagOp {
+                        type = setOp {
+                            type = SetOp.Type.INTERSECT
+                            setq = null
+                        }
+                        outer = false
+                        lhs = v("y")
+                        rhs = v("z")
+                    }
+                }
+            },
         )
 
         @JvmStatic