Add parsing support for ANY/SOME/ALL comparison modifiers. (#16080

) Signed-off-by: Arthur Schreiber <[email protected]> Signed-off-by: Andres Taylor <[email protected]> Signed-off-by: Manan Gupta <[email protected]> Co-authored-by: Andres Taylor <[email protected]> Co-authored-by: Manan Gupta <[email protected]>
vitessio · Jun 11, 2024 · dbb8863 · dbb8863
1 parent 2531cd0
commit dbb8863
Show file tree

Hide file tree

Showing 15 changed files with 10,009 additions and 9,824 deletions.
diff --git a/go/vt/sqlparser/ast.go b/go/vt/sqlparser/ast.go
@@ -2273,13 +2273,17 @@ type (
 	// ComparisonExpr represents a two-value comparison expression.
 	ComparisonExpr struct {
 		Operator    ComparisonExprOperator
+		Modifier    ComparisonModifier
 		Left, Right Expr
 		Escape      Expr
 	}
 
 	// ComparisonExprOperator is an enum for ComparisonExpr.Operator
 	ComparisonExprOperator int8
 
+	// ComparisonModifier is an enum for ComparisonExpr.Modifier
+	ComparisonModifier int8
+
 	// BetweenExpr represents a BETWEEN or a NOT BETWEEN expression.
 	BetweenExpr struct {
 		IsBetween bool

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
@@ -1301,7 +1301,13 @@ func (node *NotExpr) Format(buf *TrackedBuffer) {
 
 // Format formats the node.
 func (node *ComparisonExpr) Format(buf *TrackedBuffer) {
-	buf.astPrintf(node, "%l %s %r", node.Left, node.Operator.ToString(), node.Right)
+	buf.astPrintf(node, "%l %s", node.Left, node.Operator.ToString())
+	if node.Modifier == All {
+		buf.literal(" all")
+	} else if node.Modifier == Any {
+		buf.literal(" any")
+	}
+	buf.astPrintf(node, " %r", node.Right)
 	if node.Escape != nil {
 		buf.astPrintf(node, " escape %v", node.Escape)
 	}

diff --git a/go/vt/sqlparser/ast_format_fast.go b/go/vt/sqlparser/ast_format_fast.go
diff --git a/go/vt/sqlparser/constants.go b/go/vt/sqlparser/constants.go
@@ -677,6 +677,12 @@ const (
 	NotRegexpOp
 )
 
+const (
+	Missing ComparisonModifier = iota
+	Any
+	All
+)
+
 func (op ComparisonExprOperator) Inverse() ComparisonExprOperator {
 	switch op {
 	case EqualOp:

diff --git a/go/vt/sqlparser/keywords.go b/go/vt/sqlparser/keywords.go
@@ -126,6 +126,7 @@ var keywords = []keyword{
 	{"always", ALWAYS},
 	{"analyze", ANALYZE},
 	{"and", AND},
+	{"any", ANY},
 	{"any_value", ANY_VALUE},
 	{"array", ARRAY},
 	{"as", AS},
@@ -584,6 +585,7 @@ var keywords = []keyword{
 	{"slow", SLOW},
 	{"smallint", SMALLINT},
 	{"snapshot", SNAPSHOT},
+	{"some", SOME},
 	{"spatial", SPATIAL},
 	{"specific", UNUSED},
 	{"sql", SQL},

diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
@@ -3798,7 +3798,15 @@ var (
 	}, {
 		input:  `select * from tbl where foo is unknown or bar is not unknown`,
 		output: `select * from tbl where foo is null or bar is not null`,
-	}}
+	}, {
+		input: `select * from tbl where foo = any (select foo from tbl2)`,
+	}, {
+		input:  `select * from tbl where foo = some (select foo from tbl2)`,
+		output: `select * from tbl where foo = any (select foo from tbl2)`,
+	}, {
+		input: `select * from tbl where foo > any (select foo from tbl2)`,
+	}, {
+		input: `select * from tbl where foo > all (select foo from tbl2)`}}
 )
 
 func TestValid(t *testing.T) {
@@ -4045,6 +4053,9 @@ func TestInvalid(t *testing.T) {
 	}, {
 		input: "SELECT 0b2 FROM user",
 		err:   "syntax error at position 11",
+	}, {
+		input: "select * from foo where b <=> any (select id from t1)",
+		err:   "syntax error at position 42",
 	},
 	}