add alter and drop procedure statement for oracle (#20463)

* add createProcedure rule for oracle #1 * add createProcedure rule for oracle #2 * add createProcedure rule for oracle #3 * add createProcedure rule for oracle #4 * add createProcedure rule for oracle #5 * add createProcedure rule for oracle #6 * add createProcedure rule for oracle #6 * add createProcedure rule for oracle #7 * add dropProcedure and alterProcedure rule for oracle * add javadoc and final for ProcedureStatement
apache · Aug 24, 2022 · 15ee3e3 · 15ee3e3
1 parent 66242c5
commit 15ee3e3
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 27 deletions.
diff --git a/...dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4 b/...dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4
@@ -23,12 +23,28 @@ call
     : CALL 
     ;
 
+alterProcedure
+    : ALTER PROCEDURE (schemaName DOT_)? procedureName (procedureCompileClause | (EDITIONABLE | NONEDITIONABLE))
+    ;
+
+procedureCompileClause
+    : COMPILE DEBUG? (compilerParametersClause)* (REUSE SETTINGS)?
+    ;
+
+compilerParametersClause
+    : parameterName EQ_ parameterName
+    ;
+
+dropProcedure
+    : DROP PROCEDURE (schemaName DOT_)? procedureName
+    ;
+
 createProcedure
     : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? PROCEDURE plsqlProcedureSource
     ;
 
 plsqlProcedureSource
-    : (schemaName DOT_)? procedureName ( LP_ parameterDeclaration ( COMMA_ parameterDeclaration )* RP_)? sharingClause?
+    : (schemaName DOT_)? procedureName (LP_ parameterDeclaration (COMMA_ parameterDeclaration)* RP_)? sharingClause?
     ((defaultCollationClause | invokerRightsClause | accessibleByClause)*)? (IS | AS) (callSpec | declareSection? body)
     ;
 
@@ -38,8 +54,8 @@ body
 
 //need add more statement type according to the doc
 statement
-    : ( SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ ( SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ ) *)?
-        ( select
+    : (SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ (SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_) *)?
+        (select
         | update
         | delete
         | insert
@@ -49,7 +65,7 @@ statement
     ;
 
 exceptionHandler
-    : WHEN ( (typeName (OR typeName)* )| OTHERS ) THEN statement+
+    : WHEN ((typeName (OR typeName)*)| OTHERS) THEN statement+
     ;
 
 declareSection
@@ -62,27 +78,27 @@ itemList2
     ;
 
 cursorDefinition
-    : CURSOR variableName ( LP_ cursorParameterDec ( COMMA_ cursorParameterDec )* RP_)? ( RETURN rowtype)? IS select SEMI_
+    : CURSOR variableName (LP_ cursorParameterDec (COMMA_ cursorParameterDec)* RP_)? (RETURN rowtype)? IS select SEMI_
     ;
 
 functionDefinition
-    : functionHeading ( DETERMINISTIC | PIPELINED | PARALLEL_ENABLE | resultCacheClause )+  ( IS | AS ) ( declareSection ? body | callSpec )
+    : functionHeading (DETERMINISTIC | PIPELINED | PARALLEL_ENABLE | resultCacheClause)+  (IS | AS) (declareSection ? body | callSpec)
     ;
 
 procedureDefinition
     : procedureDeclaration (IS | AS) (callSpec | declareSection? body)
     ;
 
 itemList1
-    :( typeDefinition | cursorDeclaration | itemDeclaration | functionDeclaration | procedureDeclaration )*
+    :(typeDefinition | cursorDeclaration | itemDeclaration | functionDeclaration | procedureDeclaration)*
     ;
 
 cursorDeclaration
-    : CURSOR variableName ( ( cursorParameterDec (COMMA_ cursorParameterDec )* ) )? RETURN rowtype SEMI_
+    : CURSOR variableName ((cursorParameterDec (COMMA_ cursorParameterDec)*))? RETURN rowtype SEMI_
     ;
 
 cursorParameterDec
-    : variableName IN? dataType ( (COLON_ EQ_ | DEFAULT) expr )?
+    : variableName IN? dataType ((COLON_ EQ_ | DEFAULT) expr)?
     ;
 
 rowtype
@@ -97,8 +113,8 @@ itemDeclaration
 collectionVariableDecl
     : variableName
       (
-      typeName ( COLON_ EQ_ ( qualifiedExpression | functionCall | variableName ) )?
-      | typeName ( COLON_ EQ_  ( collectionConstructor | variableName ) )?
+      typeName (COLON_ EQ_ (qualifiedExpression | functionCall | variableName))?
+      | typeName (COLON_ EQ_  (collectionConstructor | variableName))?
       | typeName MOD_ TYPE
       )
       SEMI_
@@ -133,11 +149,11 @@ typemark
     ;
 
 collectionConstructor
-    : typeName LP_ ( identifier (COMMA_ identifier)* )? RP_
+    : typeName LP_ (identifier (COMMA_ identifier)*)? RP_
     ;
 
 constantDeclaration
-    : variableName CONSTANT dataType ( NOT NULL )? ( COLON_ EQ_ | DEFAULT ) expr SEMI_
+    : variableName CONSTANT dataType (NOT NULL)? (COLON_ EQ_ | DEFAULT) expr SEMI_
     ;
 
 cursorVariableDeclaration
@@ -149,60 +165,60 @@ exceptionDeclaration
     ;
 
 recordVariableDeclaration
-    : variableName ( typeName | rowtypeAttribute | typeName MOD_ TYPE ) SEMI_
+    : variableName (typeName | rowtypeAttribute | typeName MOD_ TYPE) SEMI_
     ;
 
 variableDeclaration
-    : variableName dataType ( ( NOT NULL )? ( COLON_ EQ_ | DEFAULT ) expr )? SEMI_
+    : variableName dataType ((NOT NULL)? (COLON_ EQ_ | DEFAULT) expr)? SEMI_
     ;
 
 typeDefinition
     : collectionTypeDefinition | recordTypeDefinition | refCursorTypeDefinition | subtypeDefinition
     ;
 
 recordTypeDefinition
-    : TYPE typeName IS RECORD  LP_ fieldDefinition ( COMMA_ fieldDefinition )* RP_ SEMI_
+    : TYPE typeName IS RECORD  LP_ fieldDefinition (COMMA_ fieldDefinition)* RP_ SEMI_
     ;
 
 fieldDefinition
-    : typeName dataType ( ( NOT NULL )? ( COLON_ EQ_ | DEFAULT ) expr )?
+    : typeName dataType ((NOT NULL)? (COLON_ EQ_ | DEFAULT) expr)?
     ;
 
 refCursorTypeDefinition
-    : TYPE typeName IS REF CURSOR ( RETURN (
+    : TYPE typeName IS REF CURSOR (RETURN (
     (typeName MOD_ ROWTYPE)
     | (typeName (MOD_ TYPE)?)
-    ) )? SEMI_
+    ))? SEMI_
     ;
 
 subtypeDefinition
-    : SUBTYPE typeName IS dataType ( constraint | characterSetClause )? ( NOT NULL )?
+    : SUBTYPE typeName IS dataType (constraint | characterSetClause)? (NOT NULL)?
     ;
 
 constraint
     : (INTEGER_ COMMA_ INTEGER_) | (RANGE NUMBER_ DOT_ DOT_ NUMBER_)
     ;
 
 collectionTypeDefinition
-    : TYPE typeName IS ( assocArrayTypeDef | varrayTypeDef | nestedTableTypeDef ) SEMI_
+    : TYPE typeName IS (assocArrayTypeDef | varrayTypeDef | nestedTableTypeDef) SEMI_
     ;
 
 varrayTypeDef
-    : ( VARRAY | (VARYING? ARRAY) ) LP_ INTEGER_ RP_ OF dataType ( NOT NULL )?
+    : (VARRAY | (VARYING? ARRAY)) LP_ INTEGER_ RP_ OF dataType (NOT NULL)?
     ;
 
 nestedTableTypeDef
-    : TABLE OF dataType ( NOT NULL )?
+    : TABLE OF dataType (NOT NULL)?
     ;
 
 assocArrayTypeDef
-    : TABLE OF dataType ( NOT NULL )?  INDEX BY ( PLS_INTEGER | BINARY_INTEGER | ( VARCHAR2 | VARCHAR2 | STRING ) LP_ INTEGER_ RP_ | LONG | typeAttribute | rowtypeAttribute )
+    : TABLE OF dataType (NOT NULL)?  INDEX BY (PLS_INTEGER | BINARY_INTEGER | (VARCHAR2 | VARCHAR2 | STRING) LP_ INTEGER_ RP_ | LONG | typeAttribute | rowtypeAttribute)
     ;
 
 typeAttribute
-    : ( variableName | objectName ) MOD_ TYPE
+    : (variableName | objectName) MOD_ TYPE
     ;
 
 rowtypeAttribute
-    : ( variableName | objectName ) MOD_ ROWTYPE
+    : (variableName | objectName) MOD_ ROWTYPE
     ;
diff --git a/...er-oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4 b/...er-oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4
@@ -123,5 +123,7 @@ execute
     | alterLockdownProfile
     | alterPluggableDatabase
     | createProcedure
+    | dropProcedure
+    | alterProcedure
     ) SEMI_?
     ;
diff --git a/...shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java b/...shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
@@ -49,6 +49,7 @@
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterPackageContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterLockdownProfileContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterPluggableDatabaseContext;
+import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterProcedureContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterSequenceContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterSessionContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterSynonymContext;
@@ -101,6 +102,7 @@
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropOperatorContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropOutlineContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropPackageContext;
+import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropProcedureContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropRestorePointContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropRollbackSegmentContext;
 import org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.DropSynonymContext;
@@ -174,6 +176,7 @@
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterOutlineStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterPackageStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterPluggableDatabaseStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterProcedureStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterSequenceStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterSessionStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterSynonymStatement;
@@ -219,6 +222,7 @@
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropOperatorStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropOutlineStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropPackageStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropProcedureStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropRestorePointStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropRollbackSegmentStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleDropSynonymStatement;
@@ -984,4 +988,14 @@ public ASTNode visitCreateProcedure(final CreateProcedureContext ctx) {
         OracleCreateProcedureStatement result = new OracleCreateProcedureStatement();
         return result;
     }
+
+    @Override
+    public ASTNode visitAlterProcedure(final AlterProcedureContext ctx) {
+        return new OracleAlterProcedureStatement();
+    }
+
+    @Override
+    public ASTNode visitDropProcedure(final DropProcedureContext ctx) {
+        return new OracleDropProcedureStatement();
+    }
 }
diff --git a/...dingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAlterProcedureStatement.java b/...dingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAlterProcedureStatement.java
@@ -0,0 +1,29 @@
+/*
+ * 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 lombok.ToString;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterProcedureStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+
+/**
+ * Oracle alter procedure statement.
+ */
+@ToString(callSuper = true)
+public final class OracleAlterProcedureStatement extends AlterProcedureStatement implements OracleStatement {
+}
diff --git a/...ingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateProcedureStatement.java b/...ingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateProcedureStatement.java
@@ -22,7 +22,10 @@
 import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateProcedureStatement;
 import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
 
+/**
+ * Oracle create procedure statement.
+ */
 @Setter
 @ToString(callSuper = true)
-public class OracleCreateProcedureStatement extends CreateProcedureStatement implements OracleStatement {
+public final class OracleCreateProcedureStatement extends CreateProcedureStatement implements OracleStatement {
 }
diff --git a/...rdingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropProcedureStatement.java b/...rdingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropProcedureStatement.java
@@ -0,0 +1,29 @@
+/*
+ * 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 lombok.ToString;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropProcedureStatement;
+import org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+
+/**
+ * Oracle drop procedure statement.
+ */
+@ToString(callSuper = true)
+public final class OracleDropProcedureStatement extends DropProcedureStatement implements OracleStatement {
+}
diff --git a/...ingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-procedure.xml b/...ingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-procedure.xml
@@ -23,4 +23,5 @@
     <alter-procedure sql-case-id="alter_procedure_depends_on" />
     <alter-procedure sql-case-id="alter_procedure_set_param" />
     <alter-procedure sql-case-id="alter_procedure_reset_param" />
+    <alter-procedure sql-case-id="alter_procedure_for_oracle" />
 </sql-parser-test-cases>
diff --git a/...dingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/drop-procedure.xml b/...dingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/drop-procedure.xml
@@ -19,4 +19,5 @@
 <sql-parser-test-cases>
     <drop-procedure sql-case-id="drop_procedure" />
     <drop-procedure sql-case-id="drop_multiple_procedure" />
+    <drop-procedure sql-case-id="drop_procedure_for_oracle" />
 </sql-parser-test-cases>
diff --git a/...-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-procedure.xml b/...-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-procedure.xml
@@ -23,4 +23,5 @@
     <sql-case id="alter_procedure_depends_on" value="ALTER PROCEDURE insert_data(integer, integer) DEPENDS ON EXTENSION myext" db-types="PostgreSQL,openGauss" />
     <sql-case id="alter_procedure_set_param" value="ALTER PROCEDURE check_password(text) SET search_path = admin,pg_temp" db-types="PostgreSQL,openGauss" />
     <sql-case id="alter_procedure_reset_param" value="ALTER PROCEDURE check_password(text) RESET search_path" db-types="PostgreSQL,openGauss" />
+    <sql-case id="alter_procedure_for_oracle" value="ALTER PROCEDURE hr.remove_emp COMPILE" db-types="Oracle" />
 </sql-cases>
diff --git a/...e-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/drop-procedure.xml b/...e-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/drop-procedure.xml
@@ -19,4 +19,5 @@
 <sql-cases>
     <sql-case id="drop_procedure" value="DROP PROCEDURE do_db_maintenance()" db-types="PostgreSQL,openGauss" />
     <sql-case id="drop_multiple_procedure" value="DROP PROCEDURE dbo.uspGetSalesbyMonth, dbo.uspUpdateSalesQuotes, dbo.uspGetSalesByYear;" db-types="SQLServer" />
+    <sql-case id="drop_procedure_for_oracle" value="DROP PROCEDURE hr.remove_emp" db-types="Oracle" />
 </sql-cases>