Adds the correct parsing for table value constructors

Adds the conversion for ExprValues to a plan node
johnedquinn · Dec 7, 2024 · 5b594e7 · 5b594e7
1 parent 801dd2e
commit 5b594e7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt b/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt
@@ -177,6 +177,7 @@ import org.partiql.ast.expr.ExprCall
 import org.partiql.ast.expr.ExprLit
 import org.partiql.ast.expr.ExprPath
 import org.partiql.ast.expr.ExprQuerySet
+import org.partiql.ast.expr.ExprRowValue
 import org.partiql.ast.expr.PathStep
 import org.partiql.ast.expr.Scope
 import org.partiql.ast.expr.SessionAttribute
@@ -1616,7 +1617,12 @@ internal class PartiQLParserDefault : PartiQLParser {
         }
 
         override fun visitTableValueConstructor(ctx: GeneratedParser.TableValueConstructorContext) = translate(ctx) {
-            val rows = visitOrEmpty<Expr>(ctx.rowValueExpressionList().expr())
+            val rows = ctx.rowValueExpressionList().expr().map {
+                when (val row = visitAs<Expr>(it)) {
+                    is ExprRowValue -> row
+                    else -> exprRowValue(listOf(row), false)
+                }
+            }
             exprValues(rows)
         }
 

diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
@@ -50,6 +50,7 @@ import org.partiql.ast.expr.ExprSessionAttribute
 import org.partiql.ast.expr.ExprStruct
 import org.partiql.ast.expr.ExprSubstring
 import org.partiql.ast.expr.ExprTrim
+import org.partiql.ast.expr.ExprValues
 import org.partiql.ast.expr.ExprVarRef
 import org.partiql.ast.expr.ExprVariant
 import org.partiql.ast.expr.PathStep
@@ -494,6 +495,11 @@ internal object RexConverter {
             return rex(ANY, op)
         }
 
+        override fun visitExprValues(node: ExprValues, ctx: Env): Rex {
+            val rows = node.rows.map { visitExprCoerce(it, ctx) }
+            return rex(BAG, rexOpCollection(rows))
+        }
+
         /**
          * Construct Rel(Scan([path])).
          *