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

tianhao960 · web-flow · commit 15ee3e3a87d9 · 2022-08-24T08:59:08.000+08:00
* 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
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-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/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/antlr4/org/apache/shardingsphere/sql/parser/autogen/OracleStatement.g4 b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-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/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/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/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleAlterProcedureStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/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/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleCreateProcedureStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/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/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/oracle/ddl/OracleDropProcedureStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/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/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/alter-procedure.xml b/shardingsphere-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/shardingsphere-test/shardingsphere-parser-test/src/main/resources/case/ddl/drop-procedure.xml b/shardingsphere-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/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/alter-procedure.xml b/shardingsphere-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/shardingsphere-test/shardingsphere-parser-test/src/main/resources/sql/supported/ddl/drop-procedure.xml b/shardingsphere-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>

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,28 @@ call`
`23`	`23`	`: CALL`
`24`	`24`	`;`
`25`	`25`
	`26`	`+alterProcedure`
	`27`	`+ : ALTER PROCEDURE (schemaName DOT_)? procedureName (procedureCompileClause \| (EDITIONABLE \| NONEDITIONABLE))`
	`28`	`+ ;`
	`29`	`+`
	`30`	`+procedureCompileClause`
	`31`	`+ : COMPILE DEBUG? (compilerParametersClause)* (REUSE SETTINGS)?`
	`32`	`+ ;`
	`33`	`+`
	`34`	`+compilerParametersClause`
	`35`	`+ : parameterName EQ_ parameterName`
	`36`	`+ ;`
	`37`	`+`
	`38`	`+dropProcedure`
	`39`	`+ : DROP PROCEDURE (schemaName DOT_)? procedureName`
	`40`	`+ ;`
	`41`	`+`
`26`	`42`	`createProcedure`
`27`	`43`	`: CREATE (OR REPLACE)? (EDITIONABLE \| NONEDITIONABLE)? PROCEDURE plsqlProcedureSource`
`28`	`44`	`;`
`29`	`45`
`30`	`46`	`plsqlProcedureSource`
`31`		`- : (schemaName DOT_)? procedureName ( LP_ parameterDeclaration ( COMMA_ parameterDeclaration )* RP_)? sharingClause?`
	`47`	`+ : (schemaName DOT_)? procedureName (LP_ parameterDeclaration (COMMA_ parameterDeclaration)* RP_)? sharingClause?`
`32`	`48`	`((defaultCollationClause \| invokerRightsClause \| accessibleByClause)*)? (IS \| AS) (callSpec \| declareSection? body)`
`33`	`49`	`;`
`34`	`50`
`@@ -38,8 +54,8 @@ body`
`38`	`54`
`39`	`55`	`//need add more statement type according to the doc`
`40`	`56`	`statement`
`41`		`- : ( SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ ( SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ ) *)?`
`42`		`- ( select`
	`57`	`+ : (SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_ (SIGNED_LEFT_SHIFT_ label SIGNED_RIGHT_SHIFT_) *)?`
	`58`	`+ (select`
`43`	`59`	`\| update`
`44`	`60`	`\| delete`
`45`	`61`	`\| insert`
`@@ -49,7 +65,7 @@ statement`
`49`	`65`	`;`
`50`	`66`
`51`	`67`	`exceptionHandler`
`52`		`- : WHEN ( (typeName (OR typeName)* )\| OTHERS ) THEN statement+`
	`68`	`+ : WHEN ((typeName (OR typeName)*)\| OTHERS) THEN statement+`
`53`	`69`	`;`
`54`	`70`
`55`	`71`	`declareSection`
`@@ -62,27 +78,27 @@ itemList2`
`62`	`78`	`;`
`63`	`79`
`64`	`80`	`cursorDefinition`
`65`		`- : CURSOR variableName ( LP_ cursorParameterDec ( COMMA_ cursorParameterDec )* RP_)? ( RETURN rowtype)? IS select SEMI_`
	`81`	`+ : CURSOR variableName (LP_ cursorParameterDec (COMMA_ cursorParameterDec)* RP_)? (RETURN rowtype)? IS select SEMI_`
`66`	`82`	`;`
`67`	`83`
`68`	`84`	`functionDefinition`
`69`		`- : functionHeading ( DETERMINISTIC \| PIPELINED \| PARALLEL_ENABLE \| resultCacheClause )+ ( IS \| AS ) ( declareSection ? body \| callSpec )`
	`85`	`+ : functionHeading (DETERMINISTIC \| PIPELINED \| PARALLEL_ENABLE \| resultCacheClause)+ (IS \| AS) (declareSection ? body \| callSpec)`
`70`	`86`	`;`
`71`	`87`
`72`	`88`	`procedureDefinition`
`73`	`89`	`: procedureDeclaration (IS \| AS) (callSpec \| declareSection? body)`
`74`	`90`	`;`
`75`	`91`
`76`	`92`	`itemList1`
`77`		`- :( typeDefinition \| cursorDeclaration \| itemDeclaration \| functionDeclaration \| procedureDeclaration )*`
	`93`	`+ :(typeDefinition \| cursorDeclaration \| itemDeclaration \| functionDeclaration \| procedureDeclaration)*`
`78`	`94`	`;`
`79`	`95`
`80`	`96`	`cursorDeclaration`
`81`		`- : CURSOR variableName ( ( cursorParameterDec (COMMA_ cursorParameterDec )* ) )? RETURN rowtype SEMI_`
	`97`	`+ : CURSOR variableName ((cursorParameterDec (COMMA_ cursorParameterDec)*))? RETURN rowtype SEMI_`
`82`	`98`	`;`
`83`	`99`
`84`	`100`	`cursorParameterDec`
`85`		`- : variableName IN? dataType ( (COLON_ EQ_ \| DEFAULT) expr )?`
	`101`	`+ : variableName IN? dataType ((COLON_ EQ_ \| DEFAULT) expr)?`
`86`	`102`	`;`
`87`	`103`
`88`	`104`	`rowtype`
`@@ -97,8 +113,8 @@ itemDeclaration`
`97`	`113`	`collectionVariableDecl`
`98`	`114`	`: variableName`
`99`	`115`	`(`
`100`		`- typeName ( COLON_ EQ_ ( qualifiedExpression \| functionCall \| variableName ) )?`
`101`		`- \| typeName ( COLON_ EQ_ ( collectionConstructor \| variableName ) )?`
	`116`	`+ typeName (COLON_ EQ_ (qualifiedExpression \| functionCall \| variableName))?`
	`117`	`+ \| typeName (COLON_ EQ_ (collectionConstructor \| variableName))?`
`102`	`118`	`\| typeName MOD_ TYPE`
`103`	`119`	`)`
`104`	`120`	`SEMI_`
`@@ -133,11 +149,11 @@ typemark`
`133`	`149`	`;`
`134`	`150`
`135`	`151`	`collectionConstructor`
`136`		`- : typeName LP_ ( identifier (COMMA_ identifier)* )? RP_`
	`152`	`+ : typeName LP_ (identifier (COMMA_ identifier)*)? RP_`
`137`	`153`	`;`
`138`	`154`
`139`	`155`	`constantDeclaration`
`140`		`- : variableName CONSTANT dataType ( NOT NULL )? ( COLON_ EQ_ \| DEFAULT ) expr SEMI_`
	`156`	`+ : variableName CONSTANT dataType (NOT NULL)? (COLON_ EQ_ \| DEFAULT) expr SEMI_`
`141`	`157`	`;`
`142`	`158`
`143`	`159`	`cursorVariableDeclaration`
`@@ -149,60 +165,60 @@ exceptionDeclaration`
`149`	`165`	`;`
`150`	`166`
`151`	`167`	`recordVariableDeclaration`
`152`		`- : variableName ( typeName \| rowtypeAttribute \| typeName MOD_ TYPE ) SEMI_`
	`168`	`+ : variableName (typeName \| rowtypeAttribute \| typeName MOD_ TYPE) SEMI_`
`153`	`169`	`;`
`154`	`170`
`155`	`171`	`variableDeclaration`
`156`		`- : variableName dataType ( ( NOT NULL )? ( COLON_ EQ_ \| DEFAULT ) expr )? SEMI_`
	`172`	`+ : variableName dataType ((NOT NULL)? (COLON_ EQ_ \| DEFAULT) expr)? SEMI_`
`157`	`173`	`;`
`158`	`174`
`159`	`175`	`typeDefinition`
`160`	`176`	`: collectionTypeDefinition \| recordTypeDefinition \| refCursorTypeDefinition \| subtypeDefinition`
`161`	`177`	`;`
`162`	`178`
`163`	`179`	`recordTypeDefinition`
`164`		`- : TYPE typeName IS RECORD LP_ fieldDefinition ( COMMA_ fieldDefinition )* RP_ SEMI_`
	`180`	`+ : TYPE typeName IS RECORD LP_ fieldDefinition (COMMA_ fieldDefinition)* RP_ SEMI_`
`165`	`181`	`;`
`166`	`182`
`167`	`183`	`fieldDefinition`
`168`		`- : typeName dataType ( ( NOT NULL )? ( COLON_ EQ_ \| DEFAULT ) expr )?`
	`184`	`+ : typeName dataType ((NOT NULL)? (COLON_ EQ_ \| DEFAULT) expr)?`
`169`	`185`	`;`
`170`	`186`
`171`	`187`	`refCursorTypeDefinition`
`172`		`- : TYPE typeName IS REF CURSOR ( RETURN (`
	`188`	`+ : TYPE typeName IS REF CURSOR (RETURN (`
`173`	`189`	`(typeName MOD_ ROWTYPE)`
`174`	`190`	`\| (typeName (MOD_ TYPE)?)`
`175`		`- ) )? SEMI_`
	`191`	`+ ))? SEMI_`
`176`	`192`	`;`
`177`	`193`
`178`	`194`	`subtypeDefinition`
`179`		`- : SUBTYPE typeName IS dataType ( constraint \| characterSetClause )? ( NOT NULL )?`
	`195`	`+ : SUBTYPE typeName IS dataType (constraint \| characterSetClause)? (NOT NULL)?`
`180`	`196`	`;`
`181`	`197`
`182`	`198`	`constraint`
`183`	`199`	`: (INTEGER_ COMMA_ INTEGER_) \| (RANGE NUMBER_ DOT_ DOT_ NUMBER_)`
`184`	`200`	`;`
`185`	`201`
`186`	`202`	`collectionTypeDefinition`
`187`		`- : TYPE typeName IS ( assocArrayTypeDef \| varrayTypeDef \| nestedTableTypeDef ) SEMI_`
	`203`	`+ : TYPE typeName IS (assocArrayTypeDef \| varrayTypeDef \| nestedTableTypeDef) SEMI_`
`188`	`204`	`;`
`189`	`205`
`190`	`206`	`varrayTypeDef`
`191`		`- : ( VARRAY \| (VARYING? ARRAY) ) LP_ INTEGER_ RP_ OF dataType ( NOT NULL )?`
	`207`	`+ : (VARRAY \| (VARYING? ARRAY)) LP_ INTEGER_ RP_ OF dataType (NOT NULL)?`
`192`	`208`	`;`
`193`	`209`
`194`	`210`	`nestedTableTypeDef`
`195`		`- : TABLE OF dataType ( NOT NULL )?`
	`211`	`+ : TABLE OF dataType (NOT NULL)?`
`196`	`212`	`;`
`197`	`213`
`198`	`214`	`assocArrayTypeDef`
`199`		`- : TABLE OF dataType ( NOT NULL )? INDEX BY ( PLS_INTEGER \| BINARY_INTEGER \| ( VARCHAR2 \| VARCHAR2 \| STRING ) LP_ INTEGER_ RP_ \| LONG \| typeAttribute \| rowtypeAttribute )`
	`215`	`+ : TABLE OF dataType (NOT NULL)? INDEX BY (PLS_INTEGER \| BINARY_INTEGER \| (VARCHAR2 \| VARCHAR2 \| STRING) LP_ INTEGER_ RP_ \| LONG \| typeAttribute \| rowtypeAttribute)`
`200`	`216`	`;`
`201`	`217`
`202`	`218`	`typeAttribute`
`203`		`- : ( variableName \| objectName ) MOD_ TYPE`
	`219`	`+ : (variableName \| objectName) MOD_ TYPE`
`204`	`220`	`;`
`205`	`221`
`206`	`222`	`rowtypeAttribute`
`207`		`- : ( variableName \| objectName ) MOD_ ROWTYPE`
	`223`	`+ : (variableName \| objectName) MOD_ ROWTYPE`
`208`	`224`	`;`
Original file line number	Diff line number	Diff line change
`@@ -123,5 +123,7 @@ execute`
`123`	`123`	`\| alterLockdownProfile`
`124`	`124`	`\| alterPluggableDatabase`
`125`	`125`	`\| createProcedure`
	`126`	`+ \| dropProcedure`
	`127`	`+ \| alterProcedure`
`126`	`128`	`) SEMI_?`
`127`	`129`	`;`