You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2023/06/05 09:33:29 UTC
[shardingsphere] branch master updated: Fix oracle parser extract function (#26053)
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 fb45e5c39e5 Fix oracle parser extract function (#26053)
fb45e5c39e5 is described below
commit fb45e5c39e5ff713867ccbe0e8758d8d80c16157
Author: Chuxin Chen <ch...@qq.com>
AuthorDate: Mon Jun 5 17:33:22 2023 +0800
Fix oracle parser extract function (#26053)
---
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 6 +++++-
.../oracle/src/main/antlr4/imports/oracle/Keyword.g4 | 20 ++++++++++++++++++++
.../resources/case/dml/select-special-function.xml | 13 +++++++++++++
.../sql/supported/dml/select-special-function.xml | 1 +
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
index 679f62166d7..242cc45b475 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -543,7 +543,7 @@ analyticFunction
;
specialFunction
- : castFunction | charFunction
+ : castFunction | charFunction | extractFunction
;
castFunction
@@ -553,6 +553,10 @@ castFunction
charFunction
: CHAR LP_ expr (COMMA_ expr)* (USING ignoredIdentifier)? RP_
;
+
+extractFunction
+ : EXTRACT LP_ (YEAR | MONTH | DAY | HOUR | MINUTE | SECOND | TIMEZONE_HOUR | TIMEZONE_MINUTE | TIMEZONE_REGION | TIMEZONE_ABBR) FROM expr RP_
+ ;
regularFunction
: regularFunctionName LP_ (expr (COMMA_ expr)* | ASTERISK_)? RP_
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
index abac20553db..94ed9c6d5e9 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
@@ -439,6 +439,22 @@ SECOND
MICROSECOND
: M I C R O S E C O N D
;
+
+TIMEZONE_HOUR
+ : T I M E Z O N E UL_ H O U R
+ ;
+
+TIMEZONE_MINUTE
+ : T I M E Z O N E UL_ M I N U T E
+ ;
+
+TIMEZONE_REGION
+ : T I M E Z O N E UL_ R E G I O N
+ ;
+
+TIMEZONE_ABBR
+ : T I M E Z O N E UL_ A B B R
+ ;
MAX
: M A X
@@ -771,3 +787,7 @@ ORDINALITY
PATH
: P A T H
;
+
+EXTRACT
+ : E X T R A C T
+ ;
diff --git a/test/it/parser/src/main/resources/case/dml/select-special-function.xml b/test/it/parser/src/main/resources/case/dml/select-special-function.xml
index 94035b3803f..3ee7abe1abf 100644
--- a/test/it/parser/src/main/resources/case/dml/select-special-function.xml
+++ b/test/it/parser/src/main/resources/case/dml/select-special-function.xml
@@ -335,6 +335,19 @@
</projections>
</select>
+ <select sql-case-id="select_extract_function_for_oracle">
+ <projections start-index="7" stop-index="56">
+ <expression-projection text="EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40')" start-index="7" stop-index="56">
+ <expr>
+ <function function-name="EXTRACT" start-index="7" stop-index="56" text="EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40')" />
+ </expr>
+ </expression-projection>
+ </projections>
+ <from>
+ <simple-table name="DUAL" start-index="63" stop-index="66" />
+ </from>
+ </select>
+
<select sql-case-id="select_mod_function">
<projections start-index="7" stop-index="22">
<expression-projection text="MOD(order_id, 1)" start-index="7" stop-index="22">
diff --git a/test/it/parser/src/main/resources/sql/supported/dml/select-special-function.xml b/test/it/parser/src/main/resources/sql/supported/dml/select-special-function.xml
index 99f8b1e8581..b22565e5bed 100644
--- a/test/it/parser/src/main/resources/sql/supported/dml/select-special-function.xml
+++ b/test/it/parser/src/main/resources/sql/supported/dml/select-special-function.xml
@@ -36,5 +36,6 @@
<sql-case id="select_values" value="SELECT VALUES(order_id) FROM t_order" db-types="MySQL" />
<sql-case id="select_current_user_brackets" value="SELECT CURRENT_USER()" db-types="MySQL" />
<sql-case id="select_extract_function" value="SELECT EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40')" db-types="PostgreSQL,openGauss" />
+ <sql-case id="select_extract_function_for_oracle" value="SELECT EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40') FROM DUAL" db-types="Oracle" />
<sql-case id="select_mod_function" value="SELECT MOD(order_id, 1) from t_order" db-types="PostgreSQL,openGauss" />
</sql-cases>