You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ch...@apache.org on 2023/07/25 05:38:47 UTC
[shardingsphere] branch master updated: Support Oracle function owner Parse (#27437)
This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 d9504268e15 Support Oracle function owner Parse (#27437)
d9504268e15 is described below
commit d9504268e150357668d7cb5abe54464a57c44855
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Tue Jul 25 17:38:38 2023 +1200
Support Oracle function owner Parse (#27437)
* Support Oracle function owner
* Support Oracle function owner
---
.../oracle/src/main/antlr4/imports/oracle/BaseRule.g4 | 2 +-
.../oracle/visitor/statement/OracleStatementVisitor.java | 4 ++++
.../src/main/resources/case/dml/select-expression.xml | 16 ++++++++++++++++
.../resources/sql/supported/dml/select-expression.xml | 1 +
4 files changed, 22 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 790e44323e1..24f6e086691 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
@@ -773,7 +773,7 @@ extractFunction
;
regularFunction
- : regularFunctionName LP_ (expr (COMMA_ expr)* | ASTERISK_)? RP_
+ : (owner DOT_)? regularFunctionName LP_ (expr (COMMA_ expr)* | ASTERISK_)? RP_
;
regularFunctionName
diff --git a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
index 65b7f1fd1f5..2eb191de482 100644
--- a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
+++ b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleStatementVisitor.java
@@ -773,6 +773,10 @@ public abstract class OracleStatementVisitor extends OracleStatementBaseVisitor<
@Override
public final ASTNode visitRegularFunction(final RegularFunctionContext ctx) {
FunctionSegment result = new FunctionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.regularFunctionName().getText(), getOriginalText(ctx));
+ if (null != ctx.owner()) {
+ OwnerContext owner = ctx.owner();
+ result.setOwner(new OwnerSegment(owner.getStart().getStartIndex(), owner.getStop().getStopIndex(), (IdentifierValue) visit(owner.identifier())));
+ }
Collection<ExpressionSegment> expressionSegments = ctx.expr().stream().map(each -> (ExpressionSegment) visit(each)).collect(Collectors.toList());
result.getParameters().addAll(expressionSegments);
return result;
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 c3caac0caa0..c2f46ecb29b 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
@@ -2579,4 +2579,20 @@
<simple-table name="t_order_item" start-index="51" stop-index="62" />
</from>
</select>
+
+ <select sql-case-id="select_dbms_logmnr_mine_value_regular_function">
+ <projections start-index="7" stop-index="63">
+ <expression-projection text="DBMS_LOGMNR.MINE_VALUE(UNDO_VALUE, 'HR.EMPLOYEES.SALARY')" start-index="7" stop-index="63">
+ <function function-name="MINE_VALUE" text="DBMS_LOGMNR.MINE_VALUE(UNDO_VALUE, 'HR.EMPLOYEES.SALARY')" owner="DBMS_LOGMNR">
+ <parameter>
+ <column name="UNDO_VALUE" />
+ <column name="HR.EMPLOYEES.SALARY" />
+ </parameter>
+ </function>
+ </expression-projection>
+ </projections>
+ <from>
+ <simple-table name="V$LOGMNR_CONTENTS" start-index="70" stop-index="86" />
+ </from>
+ </select>
</sql-parser-test-cases>
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 304ba8edeca..239ff3623d9 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
@@ -105,4 +105,5 @@
<sql-case id="select_age_for_postgres" value="SELECT * FROM cypher('sharding_test_1', $$ CREATE (n) $$) as (a agtype)" db-types="PostgreSQL" />
<sql-case id="select_datetime_expression" value="SELECT SYSTIMESTAMP AT TIME ZONE 'UTC' FROM DUAL;" db-types="Oracle" />
<sql-case id="select_between_expression" value="SELECT item_id BETWEEN 1 AND order_id, status FROM t_order_item;" db-types="MySQL" />
+ <sql-case id="select_dbms_logmnr_mine_value_regular_function" value="SELECT DBMS_LOGMNR.MINE_VALUE(UNDO_VALUE, 'HR.EMPLOYEES.SALARY') FROM V$LOGMNR_CONTENTS;" db-types="Oracle" />
</sql-cases>