This is an automated email from the ASF dual-hosted git repository.
panjuan 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 23677b68599 Support Oracle drop type statement. (#27217)
23677b68599 is described below
commit 23677b68599d58824d7cde0a5e6087fa577c3211
Author: boyjoy1127 <[email protected]>
AuthorDate: Tue Jul 18 09:46:30 2023 +0800
Support Oracle drop type statement. (#27217)
---
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 4 ++++
.../sql/parser/autogen/OracleStatement.g4 | 1 +
.../statement/type/OracleDDLStatementVisitor.java | 7 ++++++
.../oracle/ddl/OracleDropTypeStatement.java | 27 ++++++++++++++++++++++
.../src/main/resources/case/ddl/drop-type.xml | 2 ++
.../main/resources/sql/supported/ddl/drop-type.xml | 4 +++-
6 files changed, 44 insertions(+), 1 deletion(-)
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 60940a481de..d00e7a39ef8 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
@@ -2179,6 +2179,10 @@ dropDirectory
: DROP DIRECTORY directoryName
;
+dropType
+ : DROP TYPE typeName (FORCE|VALIDATE)?
+ ;
+
createFunction
: CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? FUNCTION
plsqlFunctionSource
;
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 09a1c4b562f..dd1b8f3a99b 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
@@ -108,6 +108,7 @@ execute
| createRestorePoint
| dropRestorePoint
| dropOperator
+ | dropType
| alterLibrary
| alterMaterializedZonemap
| alterJava
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 cf82eb98fe3..18d1e96ee7b 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
@@ -119,6 +119,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropSe
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropSynonymContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropTriggerContext;
+import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropTypeContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropViewContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.FlashbackDatabaseContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.FlashbackTableContext;
@@ -253,6 +254,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.Ora
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropSynonymStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropTableStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropTriggerStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropTypeStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropViewStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleFlashbackDatabaseStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleFlashbackTableStatement;
@@ -956,6 +958,11 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
return new OracleAlterLibraryStatement();
}
+ @Override
+ public ASTNode visitDropType(final DropTypeContext ctx) {
+ return new OracleDropTypeStatement();
+ }
+
@Override
public ASTNode visitAlterMaterializedZonemap(final
AlterMaterializedZonemapContext ctx) {
return new OracleAlterMaterializedZonemapStatement();
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTypeStatement.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTypeStatement.java
new file mode 100644
index 00000000000..af113a7bbcd
--- /dev/null
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTypeStatement.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.DropPackageStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+
+/**
+ * Oracle drop type statement.
+ */
+public final class OracleDropTypeStatement extends DropPackageStatement
implements OracleStatement {
+}
diff --git a/test/it/parser/src/main/resources/case/ddl/drop-type.xml
b/test/it/parser/src/main/resources/case/ddl/drop-type.xml
index 4d706e5370a..5e6b328931b 100644
--- a/test/it/parser/src/main/resources/case/ddl/drop-type.xml
+++ b/test/it/parser/src/main/resources/case/ddl/drop-type.xml
@@ -22,4 +22,6 @@
<drop-type sql-case-id="drop_type_restrict" />
<drop-type sql-case-id="drop_type_if_exists" />
<drop-type sql-case-id="drop_type_namelist" />
+ <drop-type sql-case-id="drop_type_schema_force" />
+ <drop-type sql-case-id="drop_type_schema_validate" />
</sql-parser-test-cases>
diff --git a/test/it/parser/src/main/resources/sql/supported/ddl/drop-type.xml
b/test/it/parser/src/main/resources/sql/supported/ddl/drop-type.xml
index 90759b8b98d..2047334de68 100644
--- a/test/it/parser/src/main/resources/sql/supported/ddl/drop-type.xml
+++ b/test/it/parser/src/main/resources/sql/supported/ddl/drop-type.xml
@@ -17,9 +17,11 @@
-->
<sql-cases>
- <sql-case id="drop_type" value="DROP TYPE base_type"
db-types="PostgreSQL,openGauss" />
+ <sql-case id="drop_type" value="DROP TYPE base_type"
db-types="PostgreSQL,openGauss,Oracle" />
<sql-case id="drop_type_cascade" value="DROP TYPE base_type CASCADE"
db-types="PostgreSQL,openGauss" />
<sql-case id="drop_type_restrict" value="DROP TYPE base_type RESTRICT"
db-types="PostgreSQL,openGauss" />
<sql-case id="drop_type_if_exists" value="DROP TYPE IF EXISTS base_type
RESTRICT" db-types="PostgreSQL,openGauss" />
<sql-case id="drop_type_namelist" value="DROP TYPE IF EXISTS t1,t2
RESTRICT" db-types="openGauss" />
+ <sql-case id="drop_type_schema_force" value="DROP TYPE
test_schema.base_type FORCE" db-types="Oracle" />
+ <sql-case id="drop_type_schema_validate" value="DROP TYPE
test_schema.base_type VALIDATE" db-types="Oracle" />
</sql-cases>
