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 974a7a4 support ddl cases of encrypt scenario and bind some issue
(#11113)
974a7a4 is described below
commit 974a7a4178c61f120a24fc408d0800d9d1a4f0e8
Author: Jieker <[email protected]>
AuthorDate: Mon Jul 5 12:05:05 2021 +0800
support ddl cases of encrypt scenario and bind some issue (#11113)
* support ddl of encrypt scenario and bind some issue
* profect formulate
* prefect formulate
* Update ddl-integration-test-cases.xml
prefect formulate
---
.../change_column_user_table.xml | 4 +-
.../create_user_table.xml | 4 +-
.../drop_column_user_table.xml | 2 +-
.../unchanged_user_table.xml | 2 +-
.../dataset/encrypt/change_column_user_table.xml | 2 +-
.../ddl/dataset/encrypt/create_user_table.xml | 4 +-
.../ddl/dataset/encrypt/drop_column_user_table.xml | 2 +-
.../ddl/dataset/encrypt/unchanged_user_table.xml | 2 +-
.../cases/ddl/ddl-integration-test-cases.xml | 45 ++++++++++++----------
9 files changed, 35 insertions(+), 32 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/change_column_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/change_column_user_table.xml
index 17afee1..4ae8d71 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/change_column_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/change_column_user_table.xml
@@ -18,8 +18,8 @@
<dataset>
<metadata table-name="t_user_details"
data-nodes="encrypt_write_ds_${0..9}.t_user_details_${0..9},encrypt_read_ds_${0..9}.t_user_details_${0..9}">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
- <column name="number_new_plain" type="varchar" />
+ <column name="address_id" type="integer" />
<column name="number_new_cipher" type="varchar" />
+ <column name="number_new_plain" type="varchar" />
</metadata>
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/create_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/create_user_table.xml
index 8de27c5..ad7c933 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/create_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/create_user_table.xml
@@ -18,8 +18,8 @@
<dataset>
<metadata table-name="t_user_details"
data-nodes="encrypt_write_ds_${0..9}.t_user_details_${0..9},encrypt_read_ds_${0..9}.t_user_details_${0..9}">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
- <column name="number_plain" type="varchar" />
+ <column name="address_id" type="integer" />
<column name="number_cipher" type="varchar" />
+ <column name="number_plain" type="varchar" />
</metadata>
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/drop_column_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/drop_column_user_table.xml
index 0c9e215..ed06a32 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/drop_column_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/drop_column_user_table.xml
@@ -18,6 +18,6 @@
<dataset>
<metadata table-name="t_user_details"
data-nodes="encrypt_write_ds_${0..9}.t_user_details_${0..9},encrypt_read_ds_${0..9}.t_user_details_${0..9}">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
+ <column name="address_id" type="integer" />
</metadata>
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/unchanged_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/unchanged_user_table.xml
index 8de27c5..c1b64eb 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/unchanged_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/dbtbl_with_readwrite_splitting_and_encrypt/unchanged_user_table.xml
@@ -18,7 +18,7 @@
<dataset>
<metadata table-name="t_user_details"
data-nodes="encrypt_write_ds_${0..9}.t_user_details_${0..9},encrypt_read_ds_${0..9}.t_user_details_${0..9}">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
+ <column name="address_id" type="integer" />
<column name="number_plain" type="varchar" />
<column name="number_cipher" type="varchar" />
</metadata>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/change_column_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/change_column_user_table.xml
index 091a7d8..80417be 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/change_column_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/change_column_user_table.xml
@@ -18,7 +18,7 @@
<dataset>
<metadata table-name="t_user_details" data-nodes="encrypt.t_user_details">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
+ <column name="address_id" type="integer" />
<column name="number_new_plain" type="varchar" />
<column name="number_new_cipher" type="varchar" />
</metadata>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/create_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/create_user_table.xml
index 75785ef..2819cc8 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/create_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/create_user_table.xml
@@ -18,8 +18,8 @@
<dataset>
<metadata table-name="t_user_details" data-nodes="encrypt.t_user_details">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
- <column name="number_plain" type="varchar" />
+ <column name="address_id" type="integer" />
<column name="number_cipher" type="varchar" />
+ <column name="number_plain" type="varchar" />
</metadata>
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/drop_column_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/drop_column_user_table.xml
index 99d5f5b..d281c83 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/drop_column_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/drop_column_user_table.xml
@@ -18,6 +18,6 @@
<dataset>
<metadata table-name="t_user_details" data-nodes="encrypt.t_user_details">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
+ <column name="address_id" type="integer" />
</metadata>
</dataset>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/unchanged_user_table.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/unchanged_user_table.xml
index 75785ef..da8b305 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/unchanged_user_table.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/dataset/encrypt/unchanged_user_table.xml
@@ -18,7 +18,7 @@
<dataset>
<metadata table-name="t_user_details" data-nodes="encrypt.t_user_details">
<column name="user_id" type="integer" />
- <column name="address_id" type="numeric" />
+ <column name="address_id" type="integer" />
<column name="number_plain" type="varchar" />
<column name="number_cipher" type="varchar" />
</metadata>
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
index 1a8c284..aaeb15a 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/ddl/ddl-integration-test-cases.xml
@@ -111,35 +111,38 @@
<initial-sql sql="CREATE TABLE t_broadcast_table_for_ddl(id int,
description varchar(10))" affected-table="t_broadcast_table_for_ddl" />
</assertion>
</test-case>
- <!--TODO fix me! about issue #9570-->
-<!-- <test-case sql="CREATE TABLE t_user_details (user_id INT NOT NULL,
address_id INT NOT NULL, number VARCHAR(45))"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
-<!-- <assertion expected-data-file="create_user_table.xml">-->
-<!-- <initial-sql affected-table="t_user_details" />-->
-<!-- </assertion>-->
-<!-- </test-case>-->
-
+
+ <test-case sql="CREATE TABLE t_user_details (user_id INT NOT NULL,
address_id INT NOT NULL, number VARCHAR(45))"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <assertion expected-data-file="create_user_table.xml">
+ <initial-sql affected-table="t_user_details" />
+ </assertion>
+ </test-case>
+
+ <!--FIXME #11103-->
<!-- <test-case sql="ALTER TABLE t_user_details CHANGE number number_new
VARCHAR(50)"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
<!-- <assertion expected-data-file="change_column_user_table.xml">-->
<!-- <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />-->
<!-- </assertion>-->
<!-- </test-case>-->
-
-<!-- <test-case sql="ALTER TABLE t_user_details DROP COLUMN number"
scenario-types="encrypt">-->
+
+ <!--FIXME #11105-->
+<!-- <test-case sql="ALTER TABLE t_user_details DROP COLUMN number"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
<!-- <assertion expected-data-file="drop_column_user_table.xml">-->
<!-- <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />-->
<!-- </assertion>-->
<!-- </test-case>-->
-
-<!-- <test-case sql="DROP TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
-<!-- <assertion expected-data-file="drop_user_table.xml">-->
-<!-- <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />-->
-<!-- </assertion>-->
-<!-- </test-case>-->
-
-<!-- <test-case sql="TRUNCATE TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">-->
-<!-- <assertion expected-data-file="unchanged_user_table.xml">-->
-<!-- <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />-->
-<!-- </assertion>-->
-<!-- </test-case>-->
+
+ <test-case sql="DROP TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <assertion expected-data-file="drop_user_table.xml">
+ <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />
+ </assertion>
+ </test-case>
+
+ <test-case sql="TRUNCATE TABLE t_user_details"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt">
+ <assertion expected-data-file="unchanged_user_table.xml">
+ <initial-sql sql="CREATE TABLE t_user_details (user_id INT NOT
NULL, address_id INT NOT NULL, number_plain VARCHAR(45) NULL, number_cipher
VARCHAR(45) NULL)" affected-table="t_user_details" />
+ </assertion>
+ </test-case>
+
<!-- TODO add single table DDL test cases -->
</integration-test-cases>
