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 9d724a2819a Rename Oracle StoreProcedure to PL/SQL and move function
to PL/SQL (#27910)
9d724a2819a is described below
commit 9d724a2819abbf243791f7917d2bd083fcbb7fd8
Author: 吴伟杰 <[email protected]>
AuthorDate: Fri Aug 4 13:59:20 2023 +0800
Rename Oracle StoreProcedure to PL/SQL and move function to PL/SQL (#27910)
---
.../src/main/antlr4/imports/oracle/DDLStatement.g4 | 18 ------------------
.../imports/oracle/{StoreProcedure.g4 => PLSQL.g4} | 20 +++++++++++++++++++-
.../sql/parser/autogen/OracleStatement.g4 | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
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 5b8bb1913a4..a90a88881ce 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
@@ -2309,24 +2309,6 @@ dropType
: DROP TYPE typeName (FORCE|VALIDATE)?
;
-createFunction
- : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? FUNCTION
plsqlFunctionSource
- ;
-
-plsqlFunctionSource
- : function (LP_ parameterDeclaration (COMMA_ parameterDeclaration)* RP_)?
RETURN dataType
- sharingClause? (invokerRightsClause
- | accessibleByClause
- | defaultCollationoOptionClause
- | deterministicClause
- | parallelEnableClause
- | resultCacheClause
- | aggregateClause
- | pipelinedClause
- | sqlMacroClause)*
- (IS | AS) callSpec
- ;
-
parameterDeclaration
: parameterName (IN? dataType ((ASSIGNMENT_OPERATOR_ | DEFAULT) expr)? |
IN? OUT NOCOPY? dataType)?
;
diff --git
a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4
b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/PLSQL.g4
similarity index 91%
rename from
parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4
rename to parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/PLSQL.g4
index f0d436d48e7..dee98037ae1 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/StoreProcedure.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/PLSQL.g4
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-grammar StoreProcedure;
+grammar PLSQL;
import Keyword, BaseRule, DDLStatement, DMLStatement;
@@ -48,6 +48,24 @@ plsqlProcedureSource
((defaultCollationClause | invokerRightsClause | accessibleByClause)*)?
(IS | AS) (callSpec | declareSection? body)
;
+createFunction
+ : CREATE (OR REPLACE)? (EDITIONABLE | NONEDITIONABLE)? FUNCTION
plsqlFunctionSource
+ ;
+
+plsqlFunctionSource
+ : function (LP_ parameterDeclaration (COMMA_ parameterDeclaration)* RP_)?
RETURN dataType
+ sharingClause? (invokerRightsClause
+ | accessibleByClause
+ | defaultCollationoOptionClause
+ | deterministicClause
+ | parallelEnableClause
+ | resultCacheClause
+ | aggregateClause
+ | pipelinedClause
+ | sqlMacroClause)*
+ (IS | AS) (callSpec | declareSection? body)
+ ;
+
body
: BEGIN statement+ (EXCEPTION (exceptionHandler)+)? END (identifier)? SEMI_
;
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 278f57e9e34..6e53c7ae744 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
@@ -17,7 +17,7 @@
grammar OracleStatement;
-import DMLStatement, TCLStatement, DCLStatement, DALStatement, StoreProcedure;
+import DMLStatement, TCLStatement, DCLStatement, DALStatement, PLSQL;
execute
: (select