This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 ac5be8a9a42 Update Oracle DML SLELECT ROWID statement parse (#22088)
ac5be8a9a42 is described below
commit ac5be8a9a42c3f33c353953d90cd37514dbf616c
Author: Zichao <[email protected]>
AuthorDate: Sat Nov 12 03:26:31 2022 +1300
Update Oracle DML SLELECT ROWID statement parse (#22088)
* Update Oracle DML SLELECT ROWID statement parse
* Update Oracle DML SLELECT ROWID statement parse
---
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 4 +--
.../src/main/antlr4/imports/oracle/Keyword.g4 | 4 +++
test/parser/src/main/resources/case/dml/select.xml | 33 ++++++++++++++++++++++
.../main/resources/sql/supported/dml/select.xml | 1 +
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git
a/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
b/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
index 3bd6528cf97..ff988708393 100644
--- a/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
+++ b/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -162,7 +162,7 @@ unreservedWord
| ENFORCED | TRUSTED | ID | SYNCHRONOUS | ASYNCHRONOUS | REPEAT | FEATURE
| STATEMENT | CLAUSE | UNPLUG
| HOST | PORT | EVERY | MINUTES | HOURS | NORELOCATE | SAVE | DISCARD |
APPLICATION | INSTALL
| MINIMUM | VERSION | UNINSTALL | COMPATIBILITY | MATERIALIZE | SUBTYPE |
RECORD | CONSTANT | CURSOR
- | OTHERS | EXCEPTION | CPU_PER_SESSION | CONNECT_TIME |
LOGICAL_READS_PER_SESSION | PRIVATE_SGA | PERCENT_RANK
+ | OTHERS | EXCEPTION | CPU_PER_SESSION | CONNECT_TIME |
LOGICAL_READS_PER_SESSION | PRIVATE_SGA | PERCENT_RANK | ROWID
;
schemaName
@@ -616,7 +616,7 @@ dataTypeName
| BOOLEAN | PLS_INTEGER | BINARY_INTEGER | INTEGER | NUMBER | NATURAL |
NATURALN | POSITIVE | POSITIVEN | SIGNTYPE
| SIMPLE_INTEGER | BFILE | MLSLABEL | UROWID | DATE | TIMESTAMP |
TIMESTAMP WITH TIME ZONE | TIMESTAMP WITH LOCAL TIME ZONE
| INTERVAL DAY TO SECOND | INTERVAL YEAR TO MONTH | JSON | FLOAT | REAL |
DOUBLE PRECISION | INT | SMALLINT
- | DECIMAL | NUMERIC | DEC | IDENTIFIER_ | XMLTYPE
+ | DECIMAL | NUMERIC | DEC | IDENTIFIER_ | XMLTYPE | ROWID
;
datetimeTypeSuffix
diff --git
a/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
b/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
index 2e9dff61971..66ac288266e 100644
--- a/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
+++ b/sql-parser/dialect/oracle/src/main/antlr4/imports/oracle/Keyword.g4
@@ -599,3 +599,7 @@ PARTITION
RANK
: R A N K
;
+
+ROWID
+ : R O W I D
+ ;
diff --git a/test/parser/src/main/resources/case/dml/select.xml
b/test/parser/src/main/resources/case/dml/select.xml
index 0377f6066fd..89a382352ce 100644
--- a/test/parser/src/main/resources/case/dml/select.xml
+++ b/test/parser/src/main/resources/case/dml/select.xml
@@ -4540,4 +4540,37 @@
<simple-table name="employees" start-index="76" stop-index="84" />
</from>
</select>
+
+ <select sql-case-id="select_rowid">
+ <projections start-index="7" stop-index="11">
+ <column-projection name="ROWID" start-index="7" stop-index="11" />
+ </projections>
+ <from>
+ <simple-table name="employees" start-index="18" stop-index="26" />
+ </from>
+ <where start-index="28" stop-index="65">
+ <expr>
+ <binary-operation-expression start-index="34" stop-index="65">
+ <left>
+ <function function-name="ROWIDTOCHAR" start-index="34"
stop-index="51" text="ROWIDTOCHAR(ROWID)">
+ <parameter>
+ <column name="ROWID" start-index="46"
stop-index="50" />
+ </parameter>
+ </function>
+ </left>
+ <operator>LIKE</operator>
+ <right>
+ <list-expression start-index="58" stop-index="65">
+ <items>
+ <literal-expression value="%JAAB%"
start-index="58" stop-index="65" />
+ </items>
+ </list-expression>
+ </right>
+ </binary-operation-expression>
+ </expr>
+ </where>
+ <order-by>
+ <column-item name="ROWID" start-index="76" stop-index="80" />
+ </order-by>
+ </select>
</sql-parser-test-cases>
diff --git a/test/parser/src/main/resources/sql/supported/dml/select.xml
b/test/parser/src/main/resources/sql/supported/dml/select.xml
index d59c3cf729e..74adfa43f64 100644
--- a/test/parser/src/main/resources/sql/supported/dml/select.xml
+++ b/test/parser/src/main/resources/sql/supported/dml/select.xml
@@ -140,4 +140,5 @@
<sql-case id="select_aggregate_percentile_disc" value="SELECT
department_id, last_name, salary, PERCENTILE_DISC(0.5) WITHIN GROUP (ORDER BY
salary DESC) OVER (PARTITION BY department_id) 'Percentile_Disc' FROM employees
WHERE department_id in (30, 60) ORDER BY last_name, salary, department_id;"
db-types="Oracle" />
<sql-case id="select_aggregate_cume_dist" value="SELECT CUME_DIST(15500,
.05) WITHIN GROUP (ORDER BY salary, commission_pct) 'Cume-Dist of 15500' FROM
employees;" db-types="Oracle" />
<sql-case id="select_aggregate_rank" value="SELECT RANK(15500) WITHIN
GROUP (ORDER BY salary DESC) 'Rank of 15500' FROM employees;" db-types="Oracle"
/>
+ <sql-case id="select_rowid" value="SELECT ROWID FROM employees WHERE
ROWIDTOCHAR(ROWID) LIKE '%JAAB%' ORDER BY ROWID;" db-types="Oracle" />
</sql-cases>
