This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 079e737f41f Fixes #24424, support mysql member of grammar (#24603)
079e737f41f is described below
commit 079e737f41fe72b08a1a63f3c3704698f2e72b97
Author: avalon5666 <[email protected]>
AuthorDate: Wed Mar 15 08:30:58 2023 +0800
Fixes #24424, support mysql member of grammar (#24603)
---
.../src/main/antlr4/imports/mysql/BaseRule.g4 | 1 +
.../statement/impl/MySQLStatementSQLVisitor.java | 10 ++++++++++
.../main/resources/case/dml/select-expression.xml | 22 ++++++++++++++++++++++
.../sql/supported/dml/select-expression.xml | 1 +
4 files changed, 34 insertions(+)
diff --git a/sql-parser/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
b/sql-parser/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index d4dc4e6cbdf..800281055bc 100644
--- a/sql-parser/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++ b/sql-parser/dialect/mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -831,6 +831,7 @@ notOperator
booleanPrimary
: booleanPrimary IS NOT? (TRUE | FALSE | UNKNOWN | NULL)
| booleanPrimary SAFE_EQ_ predicate
+ | booleanPrimary MEMBER OF LP_ (expr) RP_
| booleanPrimary comparisonOperator predicate
| booleanPrimary comparisonOperator (ALL | ANY) subquery
| booleanPrimary assignmentOperator predicate
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
index 73b0d7f3c81..98f792ff75c 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java
@@ -448,6 +448,16 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
if (null != ctx.comparisonOperator() || null != ctx.SAFE_EQ_()) {
return createCompareSegment(ctx);
}
+ if (null != ctx.MEMBER()) {
+ int startIndex = ctx.MEMBER().getSymbol().getStopIndex() + 5;
+ int endIndex = ctx.stop.getStopIndex() - 1;
+ String rightText = ctx.start.getInputStream().getText(new
Interval(startIndex, endIndex));
+ ExpressionSegment right = new
ExpressionProjectionSegment(startIndex, endIndex, rightText);
+ String text = ctx.start.getInputStream().getText(new
Interval(ctx.start.getStartIndex(), ctx.stop.getStopIndex()));
+ ExpressionSegment left = (ExpressionSegment)
visit(ctx.booleanPrimary());
+ String operator = "MEMBER OF";
+ return new BinaryOperationExpression(ctx.start.getStartIndex(),
ctx.stop.getStopIndex(), left, right, operator, text);
+ }
if (null != ctx.assignmentOperator()) {
return createAssignmentSegment(ctx);
}
diff --git a/test/it/parser/src/main/resources/case/dml/select-expression.xml
b/test/it/parser/src/main/resources/case/dml/select-expression.xml
index 035a32602bb..d43372b3df9 100644
--- a/test/it/parser/src/main/resources/case/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/case/dml/select-expression.xml
@@ -1697,6 +1697,28 @@
</where>
</select>
+ <select sql-case-id="select_where_with_simple_expr_with_json_member_of">
+ <from start-index="14" stop-index="20">
+ <simple-table name="t_order" start-index="14" stop-index="20" />
+ </from>
+ <projections distinct-row="false" start-index="7" stop-index="7">
+ <shorthand-projection start-index="7" stop-index="7" />
+ </projections>
+ <where start-index="22" stop-index="56">
+ <expr>
+ <binary-operation-expression start-index="28" stop-index="56">
+ <left>
+ <column name="order_id" start-index="28"
stop-index="35"/>
+ </left>
+ <operator>MEMBER OF</operator>
+ <right>
+ <expression-projection text=""[1,2,3]""
start-index="47" stop-index="55" />
+ </right>
+ </binary-operation-expression>
+ </expr>
+ </where>
+ </select>
+
<select
sql-case-id="select_where_with_simple_expr_with_json_unquote_extract_sign">
<from start-index="14" stop-index="20">
<simple-table name="t_order" start-index="14" stop-index="20" />
diff --git
a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
index 50166c9c764..6766e984771 100644
--- a/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dml/select-expression.xml
@@ -74,6 +74,7 @@
<sql-case id="select_where_with_simple_expr_with_exists_subquery"
value="SELECT * FROM t_order WHERE EXISTS (SELECT order_id FROM t_order_item
WHERE status > ? )" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_odbc_escape_syntax"
value="SELECT * FROM t_order WHERE {ts ?}" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_json_extract_sign"
value="SELECT * FROM t_order WHERE order_id ->"$[1]""
db-types="MySQL" />
+ <sql-case id="select_where_with_simple_expr_with_json_member_of"
value="SELECT * FROM t_order WHERE order_id member of("[1,2,3]")"
db-types="MySQL" />
<sql-case
id="select_where_with_simple_expr_with_json_unquote_extract_sign" value="SELECT
* FROM t_order WHERE order_id ->> "$[1]"" db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_json_contains"
value="SELECT * FROM t_order WHERE JSON_CONTAINS(order_msg -> '$[*].code', 'x',
'$') " db-types="MySQL" />
<sql-case id="select_where_with_simple_expr_with_json_contains_and_limit"
value="SELECT id, order_info->'$.id' FROM t_order where
json_contains(order_info, ?, '$.id') limit ?, ?" db-types="MySQL" />
