You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2025/04/01 03:21:24 UTC

(shardingsphere) branch master updated: Enhance combineType in DMLStatement.g4 to support EXCEPT ALL and INTE… (#35099)

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 0e4934f455f Enhance combineType in DMLStatement.g4 to support EXCEPT ALL and INTE… (#35099)
0e4934f455f is described below

commit 0e4934f455fe436677b62a68ec827b0d0a2cc2ee
Author: Cong Hu <ia...@gmail.com>
AuthorDate: Tue Apr 1 11:21:18 2025 +0800

    Enhance combineType in DMLStatement.g4 to support EXCEPT ALL and INTE… (#35099)
    
    * Enhance combineType in DMLStatement.g4 to support EXCEPT ALL and INTERSECT ALL
    
    * Add release note.
---
 RELEASE-NOTES.md                                                        | 1 +
 .../sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 640c69001ab..2bcda0954b8 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -29,6 +29,7 @@
 1. Encrypt: Add quotes to encrypt rewrite derived columns - [#34950](https://github.com/apache/shardingsphere/pull/34950)
 1. SQL Router: Add check for select with union all routing to multi data sources - [#35037](https://github.com/apache/shardingsphere/pull/35037)
 1. DistSQL: Add job sharding nodes to the result set of `SHOW MIGRATION LIST` - [#35053](https://github.com/apache/shardingsphere/pull/35053)
+2. SQL Parser: Enhance combineType in Oracle to support EXCEPT ALL and INTERSECT ALL - [#35099](https://github.com/apache/shardingsphere/pull/35099)
 
 ### Bug Fixes
 
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4
index 4e08ec232d0..fc2564dbc60 100644
--- a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4
+++ b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DMLStatement.g4
@@ -141,7 +141,7 @@ selectSubquery
     ;
 
 combineType
-    : UNION ALL? | INTERSECT | MINUS
+    : UNION ALL? | INTERSECT ALL? | MINUS ALL? | EXCEPT ALL?
     ;
 
 parenthesisSelectSubquery