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 f4545eb support for LAST_VALUE in SQL parsing (#12421)
f4545eb is described below
commit f4545eb57a3e5018e8030d6bba6f1f98b0c1fb45
Author: Thanoshan MV <[email protected]>
AuthorDate: Tue Sep 14 13:46:59 2021 +0530
support for LAST_VALUE in SQL parsing (#12421)
---
.../src/main/antlr4/imports/mysql/BaseRule.g4 | 1 +
.../main/resources/case/dml/select-aggregate.xml | 87 ++++++++++++++++++++++
.../sql/supported/dml/select-aggregate.xml | 2 +
3 files changed, 90 insertions(+)
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
index dcaa392..c29c3ab 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -46,6 +46,7 @@ customKeyword
| AUTOCOMMIT
| INNODB
| REDO_LOG
+ | LAST_VALUE
;
literals
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
index 97b4622..6348fdf 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/dml/select-aggregate.xml
@@ -351,4 +351,91 @@
<expression-projection text="COUNT(*) * 10" start-index="7"
stop-index="19" />
</projections>
</select>
+
+ <select sql-case-id="select_count_with_in_clause" parameters="1, 2">
+ <from>
+ <simple-table name="t_order" start-index="21" stop-index="27" />
+ </from>
+ <projections start-index="7" stop-index="14">
+ <aggregation-projection type="COUNT" inner-expression="(*)"
start-index="7" stop-index="14" />
+ </projections>
+ <where start-index="29" stop-index="54">
+ <expr>
+ <in-expression start-index="35" stop-index="54">
+ <not>false</not>
+ <left>
+ <column name="last_value" start-index="35"
stop-index="44" />
+ </left>
+ <right>
+ <list-expression start-index="49" stop-index="54">
+ <items>
+ <literal-expression value="1" start-index="50"
stop-index="50" />
+ <parameter-marker-expression value="0"
start-index="50" stop-index="50" />
+ </items>
+ <items>
+ <literal-expression value="2" start-index="53"
stop-index="53" />
+ <parameter-marker-expression value="1"
start-index="53" stop-index="53" />
+ </items>
+ </list-expression>
+ </right>
+ </in-expression>
+ </expr>
+ </where>
+ </select>
+
+ <select sql-case-id="select_count_with_not_in_clause" parameters="1, 2, 7,
9">
+ <from>
+ <simple-table name="t_order" start-index="21" stop-index="27" />
+ </from>
+ <projections start-index="7" stop-index="14">
+ <aggregation-projection type="COUNT" inner-expression="(*)"
start-index="7" stop-index="14" />
+ </projections>
+ <where start-index="29" stop-index="81">
+ <expr>
+ <binary-operation-expression start-index="35" stop-index="81">
+ <left>
+ <in-expression start-index="35" stop-index="52">
+ <not>false</not>
+ <left>
+ <column name="category" start-index="35"
stop-index="42" />
+ </left>
+ <right>
+ <list-expression start-index="47"
stop-index="52">
+ <items>
+ <literal-expression value="1"
start-index="48" stop-index="48" />
+ <parameter-marker-expression value="0"
start-index="48" stop-index="48" />
+ </items>
+ <items>
+ <literal-expression value="2"
start-index="51" stop-index="51" />
+ <parameter-marker-expression value="1"
start-index="51" stop-index="51" />
+ </items>
+ </list-expression>
+ </right>
+ </in-expression>
+ </left>
+ <operator>AND</operator>
+ <right>
+ <in-expression start-index="58" stop-index="81">
+ <not>true</not>
+ <left>
+ <column name="last_value" start-index="58"
stop-index="67" />
+ </left>
+ <right>
+ <list-expression start-index="76"
stop-index="81">
+ <items>
+ <literal-expression value="7"
start-index="77" stop-index="77" />
+ <parameter-marker-expression value="2"
start-index="77" stop-index="77" />
+ </items>
+ <items>
+ <literal-expression value="9"
start-index="80" stop-index="80" />
+ <parameter-marker-expression value="3"
start-index="80" stop-index="80" />
+ </items>
+ </list-expression>
+ </right>
+ </in-expression>
+ </right>
+ </binary-operation-expression>
+ </expr>
+ </where>
+ </select>
</sql-parser-test-cases>
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-aggregate.xml
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-aggregate.xml
index c1a6dc9..8a5704a 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-aggregate.xml
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/dml/select-aggregate.xml
@@ -29,4 +29,6 @@
<sql-case id="select_count_with_escape_character" value="SELECT
COUNT(`order_id`) AS orders_count FROM t_order" db-types="MySQL" />
<sql-case id="select_count_with_sample_clause" value="SELECT COUNT(*) * 10
FROM orders SAMPLE (10)" db-types="Oracle" />
<sql-case id="select_count_with_sample_seed_clause" value="SELECT COUNT(*)
* 10 FROM orders SAMPLE(10) SEED (1)" db-types="Oracle" />
+ <sql-case id="select_count_with_in_clause" value="SELECT COUNT(*) FROM
t_order WHERE last_value IN (?, ?)" db-types="MySQL"/>
+ <sql-case id="select_count_with_not_in_clause" value="SELECT COUNT(*) FROM
t_order WHERE category IN (?, ?) AND last_value NOT IN (?, ?)"
db-types="MySQL"/>
</sql-cases>
