[shardingsphere] branch master updated: Fix test case for `SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id = o.user_id`

[tu...@apache.org]

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

tuichenchuxin 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 5d8c861  Fix test case for `SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id = o.user_id`
     new 8aa9f71  Merge pull request #15658 from terrymanu/dev
5d8c861 is described below

commit 5d8c86155798487c9d05b4aebdc061ee737f1264
Author: zhangliang <zh...@apache.org>
AuthorDate: Sat Feb 26 23:46:24 2022 +0800

    Fix test case for `SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id = o.user_id`
---
 .../src/test/resources/cases/dql/dql-integration-test-cases.xml   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
index 11bbed3..4a3ba83 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
@@ -523,10 +523,10 @@
 <!--    <test-case sql="SELECT * FROM t_single_table s INNER JOIN t_order o ON s.id = o.order_id" db-types="MySQL,Oracle,SQLServer" scenario-types="db,tbl,dbtbl_with_readwrite_splitting">-->
 <!--        <assertion expected-data-source-name="read_dataset" />-->
 <!--    </test-case>-->
-    <!--fixme! Expected: is "pwd" but: was "pwd_plain"-->
-<!--    <test-case sql="SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id = o.user_id" db-types="MySQL,Oracle,SQLServer" scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
-<!--        <assertion expected-data-source-name="read_dataset" />-->
-<!--    </test-case>-->
+    
+    <test-case sql="SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id = o.user_id" db-types="MySQL,Oracle,SQLServer" scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+        <assertion expected-data-source-name="read_dataset" />
+    </test-case>
 
     <test-case sql="SELECT o.*, i.* FROM t_order_federate o, t_order_item_federate i WHERE o.order_id = ? AND i.item_id = ?" scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt">
         <assertion parameters="1000:int, 100000:int" expected-data-source-name="read_dataset" />