feat: add comments to VALUES

Signed-off-by: Andres Taylor <[email protected]>
vitessio · Jan 10, 2025 · 6e2c6bc · 6e2c6bc
1 parent cc0851d
commit 6e2c6bc
Show file tree

Hide file tree

Showing 12 changed files with 6,464 additions and 6,509 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -3607,8 +3607,9 @@ type ValuesStatement struct {
 	Rows    Values
 	ListArg ListArg
 
-	Order OrderBy
-	Limit *Limit
+	Comments *ParsedComments
+	Order    OrderBy
+	Limit    *Limit
 }
 
 // UpdateExprs represents a list of update expressions.

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
@@ -125,7 +125,7 @@ func (node *ValuesStatement) Format(buf *TrackedBuffer) {
 	if node.With != nil {
 		buf.astPrintf(node, "%v", node.With)
 	}
-	buf.WriteString("values ")
+	buf.astPrintf(node, "values %v", node.Comments)
 	if node.ListArg != "" {
 		buf.astPrintf(node, "%v", node.ListArg)
 	} else {

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
@@ -3058,12 +3058,15 @@ func (node *ValuesStatement) GetColumnCount() int {
 	if len(node.Rows) > 0 {
 		return len(node.Rows[0])
 	}
-	return -1 // if what we have is a ListArg, we don't know the size of the output
+	panic("no columns available") // TODO: we need a better solution than a panic
 }
 
-func (node *ValuesStatement) GetColumns() SelectExprs {
-	//TODO implement me
-	panic("implement me")
+func (node *ValuesStatement) GetColumns() (result SelectExprs) {
+	columnCount := node.GetColumnCount()
+	for i := range columnCount {
+		result = append(result, &AliasedExpr{Expr: NewColName(fmt.Sprintf("column_%d", i))})
+	}
+	panic("no columns available") // TODO: we need a better solution than a panic
 }
 
 func (node *ValuesStatement) SetComments(comments Comments) {}

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/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -3875,6 +3875,8 @@ var (
 		input: "insert into t1(a1) values ('a'), ('b')",
 	}, {
 		input: "values row('a'), row('b')",
+	}, {
+		input: "values /*my comment*/ 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))",