This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 24812ef11eb Enhance the support for Oracle SQL parsing (#30663)
24812ef11eb is described below
commit 24812ef11eb8ace5e6d73d9c8f121beaa8853d1a
Author: zhuruixuan <[email protected]>
AuthorDate: Wed Mar 27 10:01:55 2024 +0800
Enhance the support for Oracle SQL parsing (#30663)
* Change1 OracleCreateOperatorStatement
* BaseRule.g4
* Change1 OracleDDLStatementVisitor
* DDLStatement.g4
* Change1 OracleStatement.g4
* Change1 create-operator.xml
* Change1 create-operator.xml
* Change1 DDLStatement.g4
* Change2 OracleDDLStatementVisitor
---
.../src/main/antlr4/imports/oracle/BaseRule.g4 | 6 ++++-
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 28 ++++++++++++++++++++++
.../sql/parser/autogen/OracleStatement.g4 | 1 +
.../statement/type/OracleDDLStatementVisitor.java | 7 ++++++
.../oracle/ddl/OracleCreateOperatorStatement.java | 27 +++++++++++++++++++++
.../main/resources/case/ddl/create-operator.xml | 2 ++
.../sql/supported/ddl/create-operator.xml | 2 ++
7 files changed, 72 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 6e607f021e4..f3e11698035 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
@@ -944,7 +944,11 @@ lobItemList
;
dataType
- : dataTypeName dataTypeLength? | specialDatatype | dataTypeName
dataTypeLength? datetimeTypeSuffix | typeAttribute
+ : dataTypeName dataTypeLength? | specialDatatype | dataTypeName
dataTypeLength? datetimeTypeSuffix | customDataType | typeAttribute
+ ;
+
+customDataType
+ : dataTypeName DOT_ identifier
;
specialDatatype
diff --git
a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
index c1628661419..0588b3e7cfd 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
@@ -39,6 +39,34 @@ createIndex
: CREATE createIndexSpecification INDEX indexName ON
createIndexDefinitionClause usableSpecification? invalidationSpecification?
;
+createOperator
+ : CREATE OPERATOR operatorName bindDefinitionClause
+ ;
+
+bindDefinitionClause
+ : BINDING bindDefinition (COMMA_ bindDefinition)*
+ ;
+
+bindDefinition
+ : LP_ dataType (COMMA_ dataType)* RP_ returnDefinition
+ ;
+
+returnDefinition
+ : RETURN returnTypeDef implementsOperator
+ ;
+
+implementsOperator
+ : USING functionNameDef
+ ;
+
+returnTypeDef
+ : dataType
+ ;
+
+functionNameDef
+ : identifier (DOT_ functionName)?
+ ;
+
createType
: CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? TYPE plsqlTypeSource
;
diff --git
a/parser/sql/dialect/oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4
b/parser/sql/dialect/oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4
index ca44b07e98e..04ad915da7e 100644
---
a/parser/sql/dialect/oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4
+++
b/parser/sql/dialect/oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4
@@ -162,5 +162,6 @@ execute
| createTrigger
| show
| spool
+ | createOperator
) SEMI_? SLASH_? EOF
;
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
index ca47eda76c0..e8b5022728b 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -91,6 +91,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.Create
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateLockdownProfileContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateMaterializedViewContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateMaterializedViewLogContext;
+import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateOperatorContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreatePFileContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateProcedureContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateProfileContext;
@@ -286,6 +287,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.Ora
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateMaterializedViewStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateNestedTableTypeStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateObjectTypeStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateOperatorStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreatePFileStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateProcedureStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleCreateProfileStatement;
@@ -1760,4 +1762,9 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
public ASTNode visitDropDatabase(final DropDatabaseContext ctx) {
return new OracleDropDatabaseStatement();
}
+
+ @Override
+ public ASTNode visitCreateOperator(final CreateOperatorContext ctx) {
+ return new OracleCreateOperatorStatement();
+ }
}
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateOperatorStatement.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateOperatorStatement.java
new file mode 100644
index 00000000000..66c16ae9fb7
--- /dev/null
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateOperatorStatement.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl;
+
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTypeStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+
+/**
+ * Oracle create operator statement.
+ */
+public final class OracleCreateOperatorStatement extends CreateTypeStatement
implements OracleStatement {
+}
diff --git a/test/it/parser/src/main/resources/case/ddl/create-operator.xml
b/test/it/parser/src/main/resources/case/ddl/create-operator.xml
index ac22ba62bdb..955eab01d81 100644
--- a/test/it/parser/src/main/resources/case/ddl/create-operator.xml
+++ b/test/it/parser/src/main/resources/case/ddl/create-operator.xml
@@ -21,4 +21,6 @@
<create-operator sql-case-id="create_operator_with_procedure" />
<create-operator sql-case-id="create_operator_with_function" />
<create-operator sql-case-id="create_operator_with_schema_qualified_name"
/>
+ <create-operator sql-case-id="create_operator_with_binding" />
+ <create-operator
sql-case-id="create_operator_with_binding_custom_datatype" />
</sql-parser-test-cases>
diff --git
a/test/it/parser/src/main/resources/sql/supported/ddl/create-operator.xml
b/test/it/parser/src/main/resources/sql/supported/ddl/create-operator.xml
index c726980984c..4e7ef81c7eb 100644
--- a/test/it/parser/src/main/resources/sql/supported/ddl/create-operator.xml
+++ b/test/it/parser/src/main/resources/sql/supported/ddl/create-operator.xml
@@ -21,4 +21,6 @@
<sql-case id="create_operator_with_procedure" value="CREATE OPERATOR !==
(PROCEDURE = int8ne, LEFTARG = bigint, RIGHTARG = bigint, NEGATOR = ===,
COMMUTATOR = !== )" db-types="PostgreSQL" />
<sql-case id="create_operator_with_function" value="CREATE OPERATOR ##
(LEFTARG = path, RIGHTARG = path, FUNCTION = path_inter, COMMUTATOR = ## )"
db-types="PostgreSQL" />
<sql-case id="create_operator_with_schema_qualified_name" value="CREATE
OPERATOR alter1.= (PROCEDURE = alter1.same, LEFTARG = alter1.ctype, RIGHTARG =
alter1.ctype)" db-types="PostgreSQL" />
+ <sql-case id="create_operator_with_binding" value="CREATE OPERATOR
Contains BINDING (VARCHAR2, VARCHAR2) RETURN NUMBER USING TextContains;"
db-types="Oracle" />
+ <sql-case id="create_operator_with_binding_custom_datatype" value="CREATE
OPERATOR Contains BINDING (VARCHAR2, VARCHAR2) RETURN NUMBER USING
text.contains, (Spatial.Geo, Spatial.Geo) RETURN NUMBER USING
Spatial.contains;" db-types="Oracle" />
</sql-cases>
