This is an automated email from the ASF dual-hosted git repository.

sunnianjun 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 f0f53742fcd Add integration test case for sql hint (#24617)
f0f53742fcd is described below

commit f0f53742fcd3fe75f66de1b552e441de836a2188
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Mar 15 15:37:39 2023 +0800

    Add integration test case for sql hint (#24617)
---
 .../cases/ral/dataset/empty_rules/preview_sql.xml    | 20 ++++++++++----------
 .../empty_rules/preview_sql_hint.xml}                | 18 +++++++-----------
 .../resources/cases/ral/ral-integration-preview.xml  |  9 ++++++---
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git 
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql.xml
 
b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql.xml
index 47b2a357a78..e5f8a3c25ac 100644
--- 
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql.xml
+++ 
b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql.xml
@@ -20,14 +20,14 @@
         <column name="data_source_name" />
         <column name="actual_sql" />
     </metadata>
-    <row values="write_ds_0| select * from t_user_item_0 UNION ALL select * 
from t_user_item_10 UNION ALL select * from t_user_item_20 UNION ALL select * 
from t_user_item_30" />
-    <row values="write_ds_1| select * from t_user_item_1 UNION ALL select * 
from t_user_item_11 UNION ALL select * from t_user_item_21 UNION ALL select * 
from t_user_item_31" />
-    <row values="write_ds_2| select * from t_user_item_2 UNION ALL select * 
from t_user_item_12 UNION ALL select * from t_user_item_22 UNION ALL select * 
from t_user_item_32" />
-    <row values="write_ds_3| select * from t_user_item_3 UNION ALL select * 
from t_user_item_13 UNION ALL select * from t_user_item_23 UNION ALL select * 
from t_user_item_33" />
-    <row values="write_ds_4| select * from t_user_item_4 UNION ALL select * 
from t_user_item_14 UNION ALL select * from t_user_item_24 UNION ALL select * 
from t_user_item_34" />
-    <row values="write_ds_5| select * from t_user_item_5 UNION ALL select * 
from t_user_item_15 UNION ALL select * from t_user_item_25 UNION ALL select * 
from t_user_item_35" />
-    <row values="write_ds_6| select * from t_user_item_6 UNION ALL select * 
from t_user_item_16 UNION ALL select * from t_user_item_26 UNION ALL select * 
from t_user_item_36" />
-    <row values="write_ds_7| select * from t_user_item_7 UNION ALL select * 
from t_user_item_17 UNION ALL select * from t_user_item_27 UNION ALL select * 
from t_user_item_37" />
-    <row values="write_ds_8| select * from t_user_item_8 UNION ALL select * 
from t_user_item_18 UNION ALL select * from t_user_item_28 UNION ALL select * 
from t_user_item_38" />
-    <row values="write_ds_9| select * from t_user_item_9 UNION ALL select * 
from t_user_item_19 UNION ALL select * from t_user_item_29 UNION ALL select * 
from t_user_item_39" />
+    <row values="write_ds_0| SELECT * FROM t_user_item_0 UNION ALL SELECT * 
FROM t_user_item_10 UNION ALL SELECT * FROM t_user_item_20 UNION ALL SELECT * 
FROM t_user_item_30" />
+    <row values="write_ds_1| SELECT * FROM t_user_item_1 UNION ALL SELECT * 
FROM t_user_item_11 UNION ALL SELECT * FROM t_user_item_21 UNION ALL SELECT * 
FROM t_user_item_31" />
+    <row values="write_ds_2| SELECT * FROM t_user_item_2 UNION ALL SELECT * 
FROM t_user_item_12 UNION ALL SELECT * FROM t_user_item_22 UNION ALL SELECT * 
FROM t_user_item_32" />
+    <row values="write_ds_3| SELECT * FROM t_user_item_3 UNION ALL SELECT * 
FROM t_user_item_13 UNION ALL SELECT * FROM t_user_item_23 UNION ALL SELECT * 
FROM t_user_item_33" />
+    <row values="write_ds_4| SELECT * FROM t_user_item_4 UNION ALL SELECT * 
FROM t_user_item_14 UNION ALL SELECT * FROM t_user_item_24 UNION ALL SELECT * 
FROM t_user_item_34" />
+    <row values="write_ds_5| SELECT * FROM t_user_item_5 UNION ALL SELECT * 
FROM t_user_item_15 UNION ALL SELECT * FROM t_user_item_25 UNION ALL SELECT * 
FROM t_user_item_35" />
+    <row values="write_ds_6| SELECT * FROM t_user_item_6 UNION ALL SELECT * 
FROM t_user_item_16 UNION ALL SELECT * FROM t_user_item_26 UNION ALL SELECT * 
FROM t_user_item_36" />
+    <row values="write_ds_7| SELECT * FROM t_user_item_7 UNION ALL SELECT * 
FROM t_user_item_17 UNION ALL SELECT * FROM t_user_item_27 UNION ALL SELECT * 
FROM t_user_item_37" />
+    <row values="write_ds_8| SELECT * FROM t_user_item_8 UNION ALL SELECT * 
FROM t_user_item_18 UNION ALL SELECT * FROM t_user_item_28 UNION ALL SELECT * 
FROM t_user_item_38" />
+    <row values="write_ds_9| SELECT * FROM t_user_item_9 UNION ALL SELECT * 
FROM t_user_item_19 UNION ALL SELECT * FROM t_user_item_29 UNION ALL SELECT * 
FROM t_user_item_39" />
 </dataset>
diff --git 
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml 
b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql_hint.xml
similarity index 63%
copy from 
test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
copy to 
test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql_hint.xml
index eea91f3b8fc..a55e269c22b 100644
--- a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
+++ 
b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/preview_sql_hint.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one or more
   ~ contributor license agreements.  See the NOTICE file distributed with
@@ -16,13 +15,10 @@
   ~ limitations under the License.
   -->
 
-<integration-test-cases>
-    <test-case sql="preview select * from t_user_item">
-        <assertion expected-data-file="preview_sql.xml" />
-    </test-case>
-    
-    <test-case
-            sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN t_user_item 
i ON s.single_id = i.item_id WHERE i.user_id = 1">
-        <assertion expected-data-file="preview_federation_select.xml" />
-    </test-case>
-</integration-test-cases>
+<dataset>
+    <metadata>
+        <column name="data_source_name" />
+        <column name="actual_sql" />
+    </metadata>
+    <row values="write_ds_0| /* SHARDINGSPHERE_HINT: DATA_SOURCE_NAME = 
write_ds_0, SKIP_SQL_REWRITE = true */ SELECT * FROM t_user_item" />
+</dataset>
diff --git 
a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml 
b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
index eea91f3b8fc..ec7f5a62f08 100644
--- a/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
+++ b/test/e2e/suite/src/test/resources/cases/ral/ral-integration-preview.xml
@@ -17,12 +17,15 @@
   -->
 
 <integration-test-cases>
-    <test-case sql="preview select * from t_user_item">
+    <test-case sql="PREVIEW SELECT * FROM t_user_item">
         <assertion expected-data-file="preview_sql.xml" />
     </test-case>
     
-    <test-case
-            sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN t_user_item 
i ON s.single_id = i.item_id WHERE i.user_id = 1">
+    <test-case sql="PREVIEW SELECT * FROM t_single_table s INNER JOIN 
t_user_item i ON s.single_id = i.item_id WHERE i.user_id = 1">
         <assertion expected-data-file="preview_federation_select.xml" />
     </test-case>
+    
+    <test-case sql="PREVIEW /* SHARDINGSPHERE_HINT: DATA_SOURCE_NAME = 
write_ds_0, SKIP_SQL_REWRITE = true */ SELECT * FROM t_user_item">
+        <assertion expected-data-file="preview_sql_hint.xml" />
+    </test-case>
 </integration-test-cases>

Reply via email to