Add parsing support for ANY/SOME/ALL comparison modifiers.

Signed-off-by: Arthur Schreiber <arthurschreiber@github.com>

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

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)
  }

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:

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},

go/vt/sqlparser/parse_test.go

@@ -3004,25 +3004,25 @@ var (
  }, {
  input: `SELECT * FROM JSON_TABLE('[ {"c1": null} ]','$[*]' COLUMNS( c1 INT PATH '$.c1' ERROR ON ERROR )) as jt`,
  output: `select * from json_table('[ {\"c1\": null} ]', '$[*]' columns(
- c1 INT path '$.c1' error on error 
+ c1 INT path '$.c1' error on error
  )
 ) as jt`,
  }, {
  input: `SELECT * FROM JSON_TABLE( '[{"a": 1, "b": [11,111]}, {"a": 2, "b": [22,222]}]', '$[*]' COLUMNS(a INT PATH '$.a', NESTED PATH '$.b[*]' COLUMNS (b1 INT PATH '$'), NESTED PATH '$.b[*]' COLUMNS (b2 INT PATH '$'))) AS jt`,
  output: `select * from json_table('[{\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}]', '$[*]' columns(
  a INT path '$.a' ,
  nested path '$.b[*]' columns(
- b1 INT path '$' 
+ b1 INT path '$'
 ),
  nested path '$.b[*]' columns(
- b2 INT path '$' 
+ b2 INT path '$'
 )
  )
 ) as jt`,
  }, {
  input: `SELECT * FROM JSON_TABLE('[ {"c1": null} ]','$[*]' COLUMNS( c1 INT PATH '$.c1' ERROR ON ERROR )) as jt`,
  output: `select * from json_table('[ {\"c1\": null} ]', '$[*]' columns(
- c1 INT path '$.c1' error on error 
+ c1 INT path '$.c1' error on error
  )
 ) as jt`,
  }, {
@@ -3031,23 +3031,23 @@ var (
  rowid for ordinality,
  ac VARCHAR(100) path '$.a' default '111' on empty default '999' on error ,
  aj JSON path '$.a' default '{\"x\": 333}' on empty ,
- bx INT exists path '$.b' 
+ bx INT exists path '$.b'
  )
 ) as tt`,
  }, {
  input: `SELECT * FROM JSON_TABLE( '[ {"a": 1, "b": [11,111]}, {"a": 2, "b": [22,222]}, {"a":3}]', '$[*]' COLUMNS( a INT PATH '$.a', NESTED PATH '$.b[*]' COLUMNS (b INT PATH '$') ) ) AS jt WHERE b IS NOT NULL`,
  output: `select * from json_table('[ {\"a\": 1, \"b\": [11,111]}, {\"a\": 2, \"b\": [22,222]}, {\"a\":3}]', '$[*]' columns(
  a INT path '$.a' ,
  nested path '$.b[*]' columns(
- b INT path '$' 
+ b INT path '$'
 )
  )
 ) as jt where b is not null`,
  }, {
  input: `SELECT * FROM JSON_TABLE( '[{"x":2,"y":"8"},{"x":"3","y":"7"},{"x":"4","y":6}]', "$[1]" COLUMNS( xval VARCHAR(100) PATH "$.x", yval VARCHAR(100) PATH "$.y" ) ) AS jt1`,
  output: `select * from json_table('[{\"x\":2,\"y\":\"8\"},{\"x\":\"3\",\"y\":\"7\"},{\"x\":\"4\",\"y\":6}]', '$[1]' columns(
  xval VARCHAR(100) path '$.x' ,
- yval VARCHAR(100) path '$.y' 
+ yval VARCHAR(100) path '$.y'
  )
 ) as jt1`,
  }, {
@@ -3059,7 +3059,7 @@ var (
  bpath VARCHAR(10) path '$.c' ,
  ord for ordinality,
  nested path '$.l[*]' columns(
- lpath varchar(10) path '$' 
+ lpath varchar(10) path '$'
 )
 )
  )
@@ -3068,7 +3068,7 @@ var (
  input: `SELECT * FROM JSON_TABLE('[{"x":2,"y":"8"},{"x":"3","y":"7"},{"x":"4","y":6}]', "$[1]" COLUMNS( xval VARCHAR(100) PATH "$.x", yval VARCHAR(100) PATH "$.y")) AS jt1;`,
  output: `select * from json_table('[{\"x\":2,\"y\":\"8\"},{\"x\":\"3\",\"y\":\"7\"},{\"x\":\"4\",\"y\":6}]', '$[1]' columns(
  xval VARCHAR(100) path '$.x' ,
- yval VARCHAR(100) path '$.y' 
+ yval VARCHAR(100) path '$.y'
  )
 ) as jt1`,
  }, {
@@ -3798,6 +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)`,
  }}
 )