You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/02/26 02:46:41 UTC
[shardingsphere] branch master updated: add dml cases of encrypt
(#9506)
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 69c40d4 add dml cases of encrypt (#9506)
69c40d4 is described below
commit 69c40d4db68ff36b137fa6af080958ef1a8aaf8c
Author: Jieker <ji...@163.com>
AuthorDate: Fri Feb 26 10:46:21 2021 +0800
add dml cases of encrypt (#9506)
---
.../dml/dataset/db/batch_insert_into_broadcast_table.xml | 2 +-
.../dml/dataset/db/batch_insert_into_user_table.xml | 2 +-
.../resources/cases/dml/dataset/db/delete_user_table.xml | 2 +-
.../resources/cases/dml/dataset/db/update_user_table.xml | 2 +-
...elete_user_table.xml => update_user_table_by_pwd.xml} | 12 +++++++++++-
.../batch_insert_into_user_table.xml | 2 +-
.../dbtbl_with_replica_query/delete_user_table.xml | 2 +-
.../dbtbl_with_replica_query/update_user_table.xml | 2 +-
...elete_user_table.xml => update_user_table_by_pwd.xml} | 12 +++++++++++-
.../cases/dml/dataset/encrypt/delete_user_table.xml | 2 +-
.../cases/dml/dataset/encrypt/update_user_table.xml | 2 +-
...elete_user_table.xml => update_user_table_by_pwd.xml} | 5 +++--
.../replica_query/batch_insert_into_user_table.xml | 2 +-
.../dml/dataset/replica_query/delete_user_table.xml | 2 +-
.../dml/dataset/replica_query/update_user_table.xml | 12 ++----------
.../update_user_table_by_pwd.xml} | 11 ++++++-----
.../dataset/replica_query/update_without_condition.xml | 2 +-
.../dml/dataset/tbl/batch_insert_into_user_table.xml | 2 +-
.../cases/dml/dataset/tbl/delete_user_table.xml | 2 +-
.../cases/dml/dataset/tbl/update_user_table.xml | 2 +-
...elete_user_table.xml => update_user_table_by_pwd.xml} | 3 ++-
.../resources/cases/dml/dml-integration-test-cases.xml | 16 ++++++++++++++--
22 files changed, 64 insertions(+), 37 deletions(-)
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_broadcast_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_broadcast_table.xml
index 577dea1..f98b1cc 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_broadcast_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_broadcast_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="2" broadcast="true">
+<dataset update-count="2">
<metadata data-nodes="db_${0..9}.t_broadcast_table">
<column name="id" type="numeric"/>
<column name="status" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_user_table.xml
index 319825e..404a927 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/batch_insert_into_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="2" broadcast="true">
+<dataset update-count="2">
<metadata data-nodes="db_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml
index 609e846..bb5aef1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="db_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table.xml
index ab14a1b..d3df047 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="db_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table_by_pwd.xml
similarity index 82%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table_by_pwd.xml
index 609e846..fa8b064 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/db/update_user_table_by_pwd.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="db_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
@@ -23,31 +23,41 @@
<row data-node="db_0.t_user" values="11, def" />
<row data-node="db_0.t_user" values="12, hig" />
<row data-node="db_0.t_user" values="13, kli" />
+ <row data-node="db_0.t_user" values="15, abc" />
<row data-node="db_1.t_user" values="11, def" />
<row data-node="db_1.t_user" values="12, hig" />
<row data-node="db_1.t_user" values="13, kli" />
+ <row data-node="db_1.t_user" values="15, abc" />
<row data-node="db_2.t_user" values="11, def" />
<row data-node="db_2.t_user" values="12, hig" />
<row data-node="db_2.t_user" values="13, kli" />
+ <row data-node="db_2.t_user" values="15, abc" />
<row data-node="db_3.t_user" values="11, def" />
<row data-node="db_3.t_user" values="12, hig" />
<row data-node="db_3.t_user" values="13, kli" />
+ <row data-node="db_3.t_user" values="15, abc" />
<row data-node="db_4.t_user" values="11, def" />
<row data-node="db_4.t_user" values="12, hig" />
<row data-node="db_4.t_user" values="13, kli" />
+ <row data-node="db_4.t_user" values="15, abc" />
<row data-node="db_5.t_user" values="11, def" />
<row data-node="db_5.t_user" values="12, hig" />
<row data-node="db_5.t_user" values="13, kli" />
+ <row data-node="db_5.t_user" values="15, abc" />
<row data-node="db_6.t_user" values="11, def" />
<row data-node="db_6.t_user" values="12, hig" />
<row data-node="db_6.t_user" values="13, kli" />
+ <row data-node="db_6.t_user" values="15, abc" />
<row data-node="db_7.t_user" values="11, def" />
<row data-node="db_7.t_user" values="12, hig" />
<row data-node="db_7.t_user" values="13, kli" />
+ <row data-node="db_7.t_user" values="15, abc" />
<row data-node="db_8.t_user" values="11, def" />
<row data-node="db_8.t_user" values="12, hig" />
<row data-node="db_8.t_user" values="13, kli" />
+ <row data-node="db_8.t_user" values="15, abc" />
<row data-node="db_9.t_user" values="11, def" />
<row data-node="db_9.t_user" values="12, hig" />
<row data-node="db_9.t_user" values="13, kli" />
+ <row data-node="db_9.t_user" values="15, abc" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/batch_insert_into_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/batch_insert_into_user_table.xml
index 9c178c8..7b1925b 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/batch_insert_into_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/batch_insert_into_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="2" broadcast="true">
+<dataset update-count="2">
<metadata data-nodes="primary_ds_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml
index d4e121c..459db08 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="primary_ds_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table.xml
index 649b761..484e514 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="primary_ds_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table_by_pwd.xml
similarity index 81%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table_by_pwd.xml
index d4e121c..7cbe5f3 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/dbtbl_with_replica_query/update_user_table_by_pwd.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="primary_ds_${0..9}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
@@ -23,31 +23,41 @@
<row data-node="primary_ds_0.t_user" values="11, def" />
<row data-node="primary_ds_0.t_user" values="12, hig" />
<row data-node="primary_ds_0.t_user" values="13, kli" />
+ <row data-node="primary_ds_0.t_user" values="15, abc" />
<row data-node="primary_ds_1.t_user" values="11, def" />
<row data-node="primary_ds_1.t_user" values="12, hig" />
<row data-node="primary_ds_1.t_user" values="13, kli" />
+ <row data-node="primary_ds_1.t_user" values="15, abc" />
<row data-node="primary_ds_2.t_user" values="11, def" />
<row data-node="primary_ds_2.t_user" values="12, hig" />
<row data-node="primary_ds_2.t_user" values="13, kli" />
+ <row data-node="primary_ds_2.t_user" values="15, abc" />
<row data-node="primary_ds_3.t_user" values="11, def" />
<row data-node="primary_ds_3.t_user" values="12, hig" />
<row data-node="primary_ds_3.t_user" values="13, kli" />
+ <row data-node="primary_ds_3.t_user" values="15, abc" />
<row data-node="primary_ds_4.t_user" values="11, def" />
<row data-node="primary_ds_4.t_user" values="12, hig" />
<row data-node="primary_ds_4.t_user" values="13, kli" />
+ <row data-node="primary_ds_4.t_user" values="15, abc" />
<row data-node="primary_ds_5.t_user" values="11, def" />
<row data-node="primary_ds_5.t_user" values="12, hig" />
<row data-node="primary_ds_5.t_user" values="13, kli" />
+ <row data-node="primary_ds_5.t_user" values="15, abc" />
<row data-node="primary_ds_6.t_user" values="11, def" />
<row data-node="primary_ds_6.t_user" values="12, hig" />
<row data-node="primary_ds_6.t_user" values="13, kli" />
+ <row data-node="primary_ds_6.t_user" values="15, abc" />
<row data-node="primary_ds_7.t_user" values="11, def" />
<row data-node="primary_ds_7.t_user" values="12, hig" />
<row data-node="primary_ds_7.t_user" values="13, kli" />
+ <row data-node="primary_ds_7.t_user" values="15, abc" />
<row data-node="primary_ds_8.t_user" values="11, def" />
<row data-node="primary_ds_8.t_user" values="12, hig" />
<row data-node="primary_ds_8.t_user" values="13, kli" />
+ <row data-node="primary_ds_8.t_user" values="15, abc" />
<row data-node="primary_ds_9.t_user" values="11, def" />
<row data-node="primary_ds_9.t_user" values="12, hig" />
<row data-node="primary_ds_9.t_user" values="13, kli" />
+ <row data-node="primary_ds_9.t_user" values="15, abc" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
index 749c1ba..cdbd3f1 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="encrypt.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd_plain" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
index 0b2a415..27c24b2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="encrypt.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd_plain" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
similarity index 88%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
index 749c1ba..789e6e0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
@@ -15,13 +15,14 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="encrypt.t_user">
<column name="user_id" type="numeric"/>
- <column name="pwd_plain" type="varchar"/>
+ <column name="pwd" type="varchar"/>
<column name="pwd_cipher" type="varchar"/>
</metadata>
<row data-node="encrypt.t_user" values="11, null, ad3U0KgdvmyMjHGHM1TnQA==" />
<row data-node="encrypt.t_user" values="12, null, yiGGBrwHiDXsZPtZUhPd9A==" />
<row data-node="encrypt.t_user" values="13, null, UizTwGQDouZaeZA+NYZrKA==" />
+ <row data-node="encrypt.t_user" values="15, null, xdpUjIyP5dJQfX+2tOVbYg==" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/batch_insert_into_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/batch_insert_into_user_table.xml
index ca4649f..9466dd0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/batch_insert_into_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/batch_insert_into_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="2" broadcast="true">
+<dataset update-count="2">
<metadata data-nodes="primary_ds.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/delete_user_table.xml
index 6b08f35..aa89cb0 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/delete_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="primary_ds.t_user,replica_${0..1}.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table.xml
index 972e540..4e0f751 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table.xml
@@ -15,8 +15,8 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
- <metadata data-nodes="primary_ds.t_user,replica_${0..1}.t_user">
+<dataset update-count="1">
+ <metadata data-nodes="primary_ds.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
</metadata>
@@ -24,12 +24,4 @@
<row data-node="primary_ds.t_user" values="11, def" />
<row data-node="primary_ds.t_user" values="12, hig" />
<row data-node="primary_ds.t_user" values="13, kli" />
- <row data-node="replica_0.t_user" values="10, abc" />
- <row data-node="replica_0.t_user" values="11, def" />
- <row data-node="replica_0.t_user" values="12, hig" />
- <row data-node="replica_0.t_user" values="13, kli" />
- <row data-node="replica_1.t_user" values="10, abc" />
- <row data-node="replica_1.t_user" values="11, def" />
- <row data-node="replica_1.t_user" values="12, hig" />
- <row data-node="replica_1.t_user" values="13, kli" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table_by_pwd.xml
similarity index 75%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table_by_pwd.xml
index db0d952..b7e0c07 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_user_table_by_pwd.xml
@@ -15,12 +15,13 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
- <metadata data-nodes="tbl.t_user">
+<dataset update-count="1">
+ <metadata data-nodes="primary_ds.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
</metadata>
- <row data-node="tbl.t_user" values="11, def" />
- <row data-node="tbl.t_user" values="12, hig" />
- <row data-node="tbl.t_user" values="13, kli" />
+ <row data-node="primary_ds.t_user" values="11, def" />
+ <row data-node="primary_ds.t_user" values="12, hig" />
+ <row data-node="primary_ds.t_user" values="13, kli" />
+ <row data-node="primary_ds.t_user" values="15, abc" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_without_condition.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_without_condition.xml
index 8993676..76d6ff2 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_without_condition.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/replica_query/update_without_condition.xml
@@ -16,7 +16,7 @@
-->
<dataset update-count="40">
- <metadata data-nodes="primary_ds.t_order,replica_ds_${0..1}.t_order">
+ <metadata data-nodes="primary_ds.t_order,replica_${0..1}.t_order">
<column name="order_id" type="numeric" />
<column name="user_id" type="numeric" />
<column name="status" type="varchar" />
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/batch_insert_into_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/batch_insert_into_user_table.xml
index d99e967..e8d3a83 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/batch_insert_into_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/batch_insert_into_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="2" broadcast="true">
+<dataset update-count="2">
<metadata data-nodes="tbl.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
index db0d952..f9e5810 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="tbl.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table.xml
index 41dc5dd..71d70da 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="tbl.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table_by_pwd.xml
similarity index 93%
copy from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
copy to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table_by_pwd.xml
index db0d952..a6b049c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/delete_user_table.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dataset/tbl/update_user_table_by_pwd.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<dataset update-count="1" broadcast="true">
+<dataset update-count="1">
<metadata data-nodes="tbl.t_user">
<column name="user_id" type="numeric"/>
<column name="pwd" type="varchar"/>
@@ -23,4 +23,5 @@
<row data-node="tbl.t_user" values="11, def" />
<row data-node="tbl.t_user" values="12, hig" />
<row data-node="tbl.t_user" values="13, kli" />
+ <row data-node="tbl.t_user" values="15, abc" />
</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
index 18b244e..270368c 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dml/dml-integration-test-cases.xml
@@ -115,6 +115,10 @@
<test-case sql="INSERT INTO t_user(user_id, pwd) values (?, 'mno'),(?, 'pqr')">
<assertion parameters="14:int, 15:int" expected-data-file="batch_insert_into_user_table.xml" />
</test-case>
+
+ <test-case sql="INSERT INTO t_user(user_id, pwd) values (14, 'mno'),(15, 'pqr')">
+ <assertion expected-data-file="batch_insert_into_user_table.xml" />
+ </test-case>
<test-case sql="UPDATE t_order SET status = ? WHERE order_id = ? AND user_id = ?">
<assertion parameters="update:String, 1000:int, 10:int" expected-data-file="update.xml" />
@@ -149,9 +153,13 @@
<assertion expected-data-file="update_broadcast_table.xml" />
</test-case>
- <test-case sql="UPDATE t_user u SET u.pwd = 'stu' WHERE user_id = 10" db-types="H2,MySQL">
+ <test-case sql="UPDATE t_user u SET u.pwd = 'stu' WHERE user_id = 10">
<assertion expected-data-file="update_user_table.xml" />
</test-case>
+
+ <test-case sql="UPDATE t_user u SET u.user_id = 15 WHERE u.pwd = 'abc'">
+ <assertion expected-data-file="update_user_table_by_pwd.xml" />
+ </test-case>
<test-case sql="DELETE FROM t_order WHERE order_id = ? AND user_id = ? AND status= ?">
<assertion parameters="1000:int, 10:int, init:String" expected-data-file="delete_with_sharding_value.xml" />
@@ -161,7 +169,11 @@
<assertion parameters="init:String" expected-data-file="delete_without_sharding_value.xml" />
</test-case>
- <test-case sql="DELETE FROM t_user WHERE user_id = 10" db-types="H2,MySQL">
+ <test-case sql="DELETE FROM t_user WHERE user_id = 10">
+ <assertion expected-data-file="delete_user_table.xml" />
+ </test-case>
+
+ <test-case sql="DELETE FROM t_user WHERE pwd = 'abc'">
<assertion expected-data-file="delete_user_table.xml" />
</test-case>