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 09022f57e71 Support Oracle drop tablespace statement. (#27221)
09022f57e71 is described below
commit 09022f57e71120a374767a3d8305e81137501a12
Author: boyjoy1127 <[email protected]>
AuthorDate: Wed Jul 19 09:09:06 2023 +0800
Support Oracle drop tablespace statement. (#27221)
* feat: support Oracle drop tablespace statement.
* refactor: support drop tablespace statement.
---
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 4 ++++
.../sql/parser/autogen/OracleStatement.g4 | 1 +
.../statement/type/OracleDDLStatementVisitor.java | 7 ++++++
.../core/database/visitor/SQLVisitorRule.java | 2 ++
.../oracle/ddl/OracleDropTableSpaceStatement.java | 27 ++++++++++++++++++++++
.../cases/parser/jaxb/RootSQLParserTestCases.java | 4 ++++
.../ddl/DropTableSpaceStatementTestCase.java | 26 +++++++++++++++++++++
.../main/resources/case/ddl/drop-tablespace.xml | 22 ++++++++++++++++++
.../sql/supported/ddl/drop-tablespace.xml | 22 ++++++++++++++++++
9 files changed, 115 insertions(+)
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 d00e7a39ef8..59a352ef9ac 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
@@ -63,6 +63,10 @@ dropTable
: DROP TABLE tableName (CASCADE CONSTRAINTS)? (PURGE)?
;
+dropTableSpace
+ : DROP TABLESPACE tablespaceName (INCLUDING CONTENTS ((AND | KEEP)
DATAFILES)? (CASCADE CONSTRAINTS)? )?
+ ;
+
dropPackage
: DROP PACKAGE BODY? packageName
;
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 dd1b8f3a99b..13d53777231 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
@@ -82,6 +82,7 @@ execute
| dropSynonym
| dropPackage
| dropEdition
+ | dropTableSpace
| dropOutline
| alterOutline
| alterAnalyticView
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 18d1e96ee7b..fc28b0333d3 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
@@ -118,6 +118,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropRo
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropSequenceContext;
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.DropTableSpaceContext;
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;
@@ -252,6 +253,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.Ora
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropRollbackSegmentStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropSequenceStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropSynonymStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropTableSpaceStatement;
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;
@@ -903,6 +905,11 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
return new OracleDropRollbackSegmentStatement();
}
+ @Override
+ public ASTNode visitDropTableSpace(final DropTableSpaceContext ctx) {
+ return new OracleDropTableSpaceStatement();
+ }
+
@Override
public ASTNode visitCreateLockdownProfile(final
CreateLockdownProfileContext ctx) {
return new OracleCreateLockdownProfileStatement();
diff --git
a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java
b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java
index 23aab5b23a0..c05393f5a8b 100644
---
a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java
+++
b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java
@@ -609,6 +609,8 @@ public enum SQLVisitorRule {
DROP_RESTORE_POINT("DropRestorePoint", SQLStatementType.DDL),
+ DROP_TABLE_SPACE("DropTableSpace", SQLStatementType.DDL),
+
ALTER_LIBRARY("AlterLibrary", SQLStatementType.DDL),
ALTER_MATERIALIZED_ZONEMAP("AlterMaterializedZonemap",
SQLStatementType.DDL),
diff --git
a/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTableSpaceStatement.java
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTableSpaceStatement.java
new file mode 100644
index 00000000000..7ff95afee2e
--- /dev/null
+++
b/parser/sql/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropTableSpaceStatement.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.DropOperatorStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+
+/**
+ * Oracle drop table space statement.
+ */
+public final class OracleDropTableSpaceStatement extends DropOperatorStatement
implements OracleStatement {
+}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
index 46934696487..d1b1a4136da 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
@@ -258,6 +258,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropStatisticsStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropSubscriptionStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropSynonymStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropTableSpaceStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropTableStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropTextSearchStatementTestCase;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl.DropTriggerStatementTestCase;
@@ -462,6 +463,9 @@ public final class RootSQLParserTestCases {
@XmlElement(name = "insert")
private final List<InsertStatementTestCase> insertTestCases = new
LinkedList<>();
+ @XmlElement(name = "drop-tablespace")
+ private final List<DropTableSpaceStatementTestCase>
dropTableSpaceTestCases = new LinkedList<>();
+
@XmlElement(name = "create-table")
private final List<CreateTableStatementTestCase> createTableTestCases =
new LinkedList<>();
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/DropTableSpaceStatementTestCase.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/DropTableSpaceStatementTestCase.java
new file mode 100644
index 00000000000..56b1251058e
--- /dev/null
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/ddl/DropTableSpaceStatementTestCase.java
@@ -0,0 +1,26 @@
+/*
+ * 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.test.it.sql.parser.internal.cases.parser.jaxb.statement.ddl;
+
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+
+/**
+ * Drop table space statement test case.
+ */
+public final class DropTableSpaceStatementTestCase extends SQLParserTestCase {
+}
diff --git a/test/it/parser/src/main/resources/case/ddl/drop-tablespace.xml
b/test/it/parser/src/main/resources/case/ddl/drop-tablespace.xml
new file mode 100644
index 00000000000..f7c3054d0a8
--- /dev/null
+++ b/test/it/parser/src/main/resources/case/ddl/drop-tablespace.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<sql-parser-test-cases>
+ <drop-tablespace sql-case-id="drop_tablespace_constraints" />
+ <drop-tablespace sql-case-id="drop_tablespace_datafiles" />
+</sql-parser-test-cases>
diff --git
a/test/it/parser/src/main/resources/sql/supported/ddl/drop-tablespace.xml
b/test/it/parser/src/main/resources/sql/supported/ddl/drop-tablespace.xml
new file mode 100644
index 00000000000..264fe3e5884
--- /dev/null
+++ b/test/it/parser/src/main/resources/sql/supported/ddl/drop-tablespace.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<sql-cases>
+ <sql-case id="drop_tablespace_constraints" value="DROP TABLESPACE tabs_02
INCLUDING CONTENTS CASCADE CONSTRAINTS" db-types="Oracle" />
+ <sql-case id="drop_tablespace_datafiles" value="DROP TABLESPACE tabs_01
INCLUDING CONTENTS AND DATAFILES" db-types="Oracle" />
+</sql-cases>