feat: fix parsing for values

Signed-off-by: Manan Gupta <manan@planetscale.com> Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitessio · Jan 9, 2025 · c46af56 · c46af56
1 parent e9b7d2d
commit c46af56
Show file tree

Hide file tree

Showing 13 changed files with 10,185 additions and 10,078 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -3581,6 +3581,7 @@ type Values []ValTuple
 
 // ValuesStatement represents a VALUES statement, as in VALUES ROW(1, 2), ROW(3, 4)
 type ValuesStatement struct {
+	With *With
 	// One but not both of these fields can be set.
 	Rows    Values
 	ListArg ListArg

diff --git a/go/vt/sqlparser/ast_clone.go b/go/vt/sqlparser/ast_clone.go
diff --git a/go/vt/sqlparser/ast_copy_on_rewrite.go b/go/vt/sqlparser/ast_copy_on_rewrite.go
diff --git a/go/vt/sqlparser/ast_equals.go b/go/vt/sqlparser/ast_equals.go
diff --git a/go/vt/sqlparser/ast_format.go b/go/vt/sqlparser/ast_format.go
@@ -122,6 +122,9 @@ func (node *VStream) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *ValuesStatement) Format(buf *TrackedBuffer) {
+	if node.With != nil {
+		buf.astPrintf(node, "%v", node.With)
+	}
 	buf.WriteString("values ")
 	if node.ListArg != "" {
 		buf.astPrintf(node, "%v", node.ListArg)

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/ast_funcs.go b/go/vt/sqlparser/ast_funcs.go
@@ -2999,7 +2999,7 @@ func (node *ValuesStatement) SetInto(into *SelectInto) {
 }
 
 func (node *ValuesStatement) SetWith(with *With) {
-	panic("cannot set With on Values statement")
+	node.With = with
 }
 
 func (node *ValuesStatement) MakeDistinct() {

diff --git a/go/vt/sqlparser/ast_rewrite.go b/go/vt/sqlparser/ast_rewrite.go
diff --git a/go/vt/sqlparser/ast_visit.go b/go/vt/sqlparser/ast_visit.go
diff --git a/go/vt/sqlparser/cached_size.go b/go/vt/sqlparser/cached_size.go
diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -3868,7 +3868,20 @@ var (
 	}, {
 		input: `select * from tbl where foo > any (select foo from tbl2)`,
 	}, {
-		input: `select * from tbl where foo > all (select foo from tbl2)`}}
+		input: `select * from tbl where foo > all (select foo from tbl2)`,
+	}, {
+		input: "insert into t1(a1) values row('a'), row('b')",
+	}, {
+		input: "insert into t1(a1) values ('a'), ('b')",
+	}, {
+		input: "values row('a'), row('b')",
+	}, {
+		input:  `with x as (select * from t1 limit 1) values ROW('a1', (select x.a1 from x))`,
+		output: "with x as (select * from t1 limit 1) values row('a1', (select x.a1 from x))",
+	}, {
+		input:  "SELECT 1,2 UNION SELECT * from (VALUES ROW(10,15)) t",
+		output: "select 1, 2 from dual union select * from (values row(10, 15)) as t",
+	}}
 )
 
 func TestValid(t *testing.T) {
@@ -6204,6 +6217,12 @@ var (
 	}, {
 		input:  "create database test_db default encryption @a",
 		output: "syntax error at position 46 near 'a'",
+	}, {
+		input:  "select * from t1 where a1 in row('a')",
+		output: "syntax error at position 33 near 'row'",
+	}, {
+		input:  "insert into t1 (a1) values row('a'), ('b')",
+		output: "syntax error at position 39",
 	}}
 )