[shardingsphere] branch master updated: DQL auto verify for encrypt (#15614)

[panjuan]

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

panjuan 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 0511498  DQL auto verify for encrypt (#15614)
0511498 is described below

commit 05114985884b7f265bf26b36d0afca6f16a88da9
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Feb 24 19:36:27 2022 +0800

    DQL auto verify for encrypt (#15614)
    
    * DQL auto verify for encrypt
    
    * Update it-env.properties
    
    * Update it-env.properties
---
 .../shardingsphere/test/integration/engine/dql/BaseDQLIT.java     | 3 ++-
 .../src/test/resources/env/it-env.properties                      | 2 +-
 .../test/resources/env/scenario/encrypt/verification_dataset.xml  | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
index 5208685..56619c0 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/BaseDQLIT.java
@@ -107,7 +107,8 @@ public abstract class BaseDQLIT extends SingleITCase {
     }
     
     private boolean isAssertRowsByResultSet() {
-        return "db".equals(getScenario()) || "tbl".equals(getScenario()) || 
"readwrite_splitting".equals(getScenario()) || 
"empty_rules".equals(getScenario()) || "shadow".equals(getScenario());
+        return "db".equals(getScenario()) || "tbl".equals(getScenario()) || 
"readwrite_splitting".equals(getScenario()) || 
"empty_rules".equals(getScenario())
+                || "shadow".equals(getScenario()) || 
"encrypt".equals(getScenario());
     }
     
     private void assertRows(final ResultSet actualResultSet, final ResultSet 
verificationResultSet) throws SQLException {
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/it-env.properties
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/it-env.properties
index d216db5..b3300a3 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/it-env.properties
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/it-env.properties
@@ -29,4 +29,4 @@ it.cluster.env.type=DOCKER
 it.cluster.adapters=proxy
 
 # it.cluster.databases=MySQL,PostgreSQL
-it.cluster.databases=MySQL,PostgreSQL
+it.cluster.databases=MySQL
diff --git 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/verification_dataset.xml
 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/verification_dataset.xml
index 0072325..1c833aa 100644
--- 
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/verification_dataset.xml
+++ 
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/scenario/encrypt/verification_dataset.xml
@@ -37,10 +37,10 @@
     <row data-node="verification_dataset.t_single_table" values="2, 11, init" 
/>
     <row data-node="verification_dataset.t_single_table" values="3, 12, init" 
/>
     <row data-node="verification_dataset.t_single_table" values="4, 13, init" 
/>
-    <row data-node="verification_dataset.t_user" values="10, 10000, 
yK+tn8E43EyCEgbqNOrJ4w==, init" />
-    <row data-node="verification_dataset.t_user" values="11, 11000, 
CIbxTwI742pGwxb18lQLkQ==, init" />
-    <row data-node="verification_dataset.t_user" values="12, 12000, 
VCHpNlwod9AiuS1V+7DSLw==, init" />
-    <row data-node="verification_dataset.t_user" values="13, 13000, 
8uxRFhW4c2rtSOoesudk/A==, init" />
+    <row data-node="verification_dataset.t_user" values="10, 10000, a10, init" 
/>
+    <row data-node="verification_dataset.t_user" values="11, 11000, b11, init" 
/>
+    <row data-node="verification_dataset.t_user" values="12, 12000, c12, init" 
/>
+    <row data-node="verification_dataset.t_user" values="13, 13000, d13, init" 
/>
     <row data-node="verification_dataset.t_user_item" values="100000, 10, 
init, 2017-08-08" />
     <row data-node="verification_dataset.t_user_item" values="110000, 11, 
init, 2017-08-08" />
     <row data-node="verification_dataset.t_user_item" values="120000, 12, 
init, 2017-08-08" />