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/03/24 02:58:33 UTC

(shardingsphere) branch master updated: Fix openGauss select combine E2E cases (#35068)

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 c9730557cdd Fix openGauss select combine E2E cases (#35068)
c9730557cdd is described below

commit c9730557cdd065e4848e077a92abbfde5b941b1f
Author: ZhangCheng <ch...@apache.org>
AuthorDate: Mon Mar 24 10:58:27 2025 +0800

    Fix openGauss select combine E2E cases (#35068)
---
 .../resources/cases/dql/e2e-dql-select-combine.xml | 60 +++++++++-------------
 1 file changed, 24 insertions(+), 36 deletions(-)

diff --git a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-combine.xml b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-combine.xml
index 180b078cdc7..1ef37fc9d60 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-combine.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-combine.xml
@@ -32,49 +32,49 @@
         <assertion parameters="2000:long, 1500:long" expected-data-source-name="read_dataset" />
     </test-case>-->
     
-    <test-case sql="SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order MINUS SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order WHERE order_id = ? UNION (SELECT * FROM t_order MINUS SELECT * FROM t_order WHERE order_id = ?) ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? UNION (SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ?) ORDER BY order_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order INTERSECT SELECT * FROM t_order WHERE order_id = ? MINUS SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long,1000:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ? INTERSECT SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="(SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order) INTERSECT (SELECT * FROM t_order WHERE order_id = ? MINUS SELECT * FROM t_order WHERE order_id = ?) ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long,1000:long" expected-data-source-name="read_dataset" />
+    <test-case sql="(SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ?) INTERSECT (SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ?) ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order MINUS SELECT * FROM t_order WHERE order_id = ? INTERSECT SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ? INTERSECT SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="(SELECT * FROM t_order MINUS SELECT * FROM t_order WHERE order_id = ?) INTERSECT SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="(SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ?) INTERSECT SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order MINUS SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order MINUS (SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order WHERE order_id = ?) ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? MINUS (SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ?) ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="SELECT * FROM t_order MINUS SELECT * FROM t_order INTERSECT SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order WHERE order_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ? INTERSECT SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
     
-    <test-case sql="(SELECT * FROM t_order MINUS SELECT * FROM t_order) INTERSECT (SELECT * FROM t_order WHERE order_id = ? UNION SELECT * FROM t_order WHERE order_id = ?) ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long,2900:long" expected-data-source-name="read_dataset" />
+    <test-case sql="(SELECT * FROM t_order WHERE user_id = ? MINUS SELECT * FROM t_order WHERE user_id = ?) INTERSECT (SELECT * FROM t_order WHERE user_id = ? UNION SELECT * FROM t_order WHERE user_id = ?) ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int,25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
     
     <!-- TODO support MySQL INTERSECT clause -->
-    <test-case sql="SELECT * FROM t_order INTERSECT ALL SELECT * FROM t_order ORDER BY order_id LIMIT 5, 5" db-types="openGauss" scenario-types="db">
-        <assertion expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? INTERSECT ALL SELECT * FROM t_order WHERE user_id = ? ORDER BY order_id LIMIT 5, 5" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
     
     <!-- TODO Replace with standard table structure -->
@@ -97,19 +97,7 @@
         <assertion parameters="1:int" expected-data-source-name="read_dataset" />
     </test-case>-->
     
-    <test-case sql="SELECT * FROM t_order MINUS ALL SELECT * FROM t_order ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion expected-data-source-name="read_dataset" />
-    </test-case>
-    
-    <test-case sql="SELECT * FROM t_order WHERE order_id > ? MINUS SELECT * FROM t_order WHERE order_id > ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2000:long, 1500:long" expected-data-source-name="read_dataset" />
-    </test-case>
-    
-    <test-case sql="SELECT o.order_id, o.user_id FROM t_order o WHERE o.order_id > ? MINUS ALL SELECT i.order_id, i.user_id FROM t_order_item i WHERE i.order_id > ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long, 2500:long" expected-data-source-name="read_dataset" />
-    </test-case>
-    
-    <test-case sql="SELECT o.order_id, o.user_id FROM t_order o WHERE o.order_id > ? MINUS SELECT i.order_id, i.user_id FROM t_order_item i WHERE i.order_id > ? ORDER BY order_id" db-types="openGauss" scenario-types="db">
-        <assertion parameters="2500:long, 2500:long" expected-data-source-name="read_dataset" />
+    <test-case sql="SELECT * FROM t_order WHERE user_id = ? MINUS ALL SELECT * FROM t_order WHERE user_id = ? ORDER BY user_id" db-types="openGauss" scenario-types="db">
+        <assertion parameters="25:int,15:int" expected-data-source-name="read_dataset" />
     </test-case>
 </e2e-test-cases>