You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/30 02:39:15 UTC
[shardingsphere] branch master updated: Add t_merchant standard table in encrypt_shadow scenario (#22515)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 8ffe2bb86b6 Add t_merchant standard table in encrypt_shadow scenario (#22515)
8ffe2bb86b6 is described below
commit 8ffe2bb86b6da9f9c9053fb5cce28cb5b5b660db
Author: ICannerxy <40...@users.noreply.github.com>
AuthorDate: Wed Nov 30 10:39:08 2022 +0800
Add t_merchant standard table in encrypt_shadow scenario (#22515)
---
.../encrypt_shadow/data/actual/dataset.xml | 48 ++++++++++++++++++++++
.../data/actual/init-sql/h2/01-actual-init.sql | 2 +
.../data/actual/init-sql/mysql/01-actual-init.sql | 2 +
.../actual/init-sql/opengauss/01-actual-init.sql | 4 ++
.../data/actual/init-sql/oracle/01-actual-init.sql | 2 +
.../actual/init-sql/postgresql/01-actual-init.sql | 4 ++
.../actual/init-sql/sqlserver/01-actual-init.sql | 3 +-
.../encrypt_shadow/data/expected/dataset.xml | 48 ++++++++++++++++++++++
.../data/expected/init-sql/h2/01-expected-init.sql | 2 +
.../expected/init-sql/mysql/01-expected-init.sql | 2 +
.../init-sql/opengauss/01-expected-init.sql | 4 ++
.../expected/init-sql/oracle/01-expected-init.sql | 3 +-
.../init-sql/postgresql/01-expected-init.sql | 5 ++-
.../init-sql/sqlserver/01-expected-init.sql | 3 +-
.../proxy/conf/mysql/config-encrypt-shadow.yaml | 43 +++++++++++++++++++
.../conf/opengauss/config-encrypt-shadow.yaml | 43 +++++++++++++++++++
.../conf/postgresql/config-encrypt-shadow.yaml | 43 +++++++++++++++++++
.../env/scenario/encrypt_shadow/rules.yaml | 45 +++++++++++++++++++-
18 files changed, 301 insertions(+), 5 deletions(-)
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/dataset.xml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/dataset.xml
index 6e2ba82f260..68b81e060cf 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/dataset.xml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/dataset.xml
@@ -30,14 +30,62 @@
<column name="type_time" type="time" />
<column name="type_timestamp" type="timestamp" />
</metadata>
+ <metadata data-nodes="db.t_merchant,encrypt_shadow_db.t_merchant">
+ <column name="merchant_id" type="numeric" />
+ <column name="country_id" type="numeric" />
+ <column name="merchant_name" type="varchar" />
+ <column name="business_code" type="varchar" />
+ <column name="telephone" type="varchar" />
+ <column name="creation_date" type="datetime" />
+ </metadata>
<row data-node="db.t_shadow" values="1, 1, C4J8SHnvFT1FDZ3vF2ELDA==, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="db.t_shadow" values="2, 1, C4J8SHnvFT1FDZ3vF2ELDA==, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="db.t_shadow" values="3, 1, C4J8SHnvFT1FDZ3vF2ELDA==, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="db.t_shadow" values="4, 1, C4J8SHnvFT1FDZ3vF2ELDA==, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="db.t_shadow" values="5, 1, C4J8SHnvFT1FDZ3vF2ELDA==, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
+ <row data-node="db.t_merchant" values="1, 86, tencent, 86000001, 86100000001, 2017-08-08" />
+ <row data-node="db.t_merchant" values="2, 86, haier, 86000002, 86100000002, 2017-08-08" />
+ <row data-node="db.t_merchant" values="3, 86, huawei, 86000003, 86100000003, 2017-08-08" />
+ <row data-node="db.t_merchant" values="4, 86, alibaba, 86000004, 86100000004, 2017-08-08" />
+ <row data-node="db.t_merchant" values="5, 86, lenovo, 86000005, 86100000005, 2017-08-08" />
+ <row data-node="db.t_merchant" values="6, 86, moutai, 86000006, 86100000006, 2017-08-08" />
+ <row data-node="db.t_merchant" values="7, 86, baidu, 86000007, 86100000007, 2017-08-08" />
+ <row data-node="db.t_merchant" values="8, 86, xiaomi, 86000008, 86100000008, 2017-08-08" />
+ <row data-node="db.t_merchant" values="9, 86, vivo, 86000009, 86100000009, 2017-08-08" />
+ <row data-node="db.t_merchant" values="10, 86, oppo, 86000010, 86100000010, 2017-08-08" />
+ <row data-node="db.t_merchant" values="11, 1, google, 01000011, 01100000011, 2017-08-08" />
+ <row data-node="db.t_merchant" values="12, 1, walmart, 01000012, 01100000012, 2017-08-08" />
+ <row data-node="db.t_merchant" values="13, 1, amazon, 01000013, 01100000013, 2017-08-08" />
+ <row data-node="db.t_merchant" values="14, 1, apple, 01000014, 01100000014, 2017-08-08" />
+ <row data-node="db.t_merchant" values="15, 1, microsoft, 01000015, 01100000015, 2017-08-08" />
+ <row data-node="db.t_merchant" values="16, 1, dell, 01000016, 01100000016, 2017-08-08" />
+ <row data-node="db.t_merchant" values="17, 1, johnson, 01000017, 01100000017, 2017-08-08" />
+ <row data-node="db.t_merchant" values="18, 1, intel, 01000018, 01100000018, 2017-08-08" />
+ <row data-node="db.t_merchant" values="19, 1, hp, 01000019, 01100000019, 2017-08-08" />
+ <row data-node="db.t_merchant" values="20, 1, tesla, 01000020, 01100000020, 2017-08-08" />
<row data-node="encrypt_shadow_db.t_shadow" values="1, 0, OuQCPda97jMdDtibdBO6Jg==, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_db.t_shadow" values="2, 0, OuQCPda97jMdDtibdBO6Jg==, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_db.t_shadow" values="3, 0, OuQCPda97jMdDtibdBO6Jg==, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_db.t_shadow" values="4, 0, OuQCPda97jMdDtibdBO6Jg==, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_db.t_shadow" values="5, 0, OuQCPda97jMdDtibdBO6Jg==, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="1, 86, tencent, 86000001, 86100000001, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="2, 86, haier, 86000002, 86100000002, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="3, 86, huawei, 86000003, 86100000003, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="4, 86, alibaba, 86000004, 86100000004, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="5, 86, lenovo, 86000005, 86100000005, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="6, 86, moutai, 86000006, 86100000006, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="7, 86, baidu, 86000007, 86100000007, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="8, 86, xiaomi, 86000008, 86100000008, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="9, 86, vivo, 86000009, 86100000009, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="10, 86, oppo, 86000010, 86100000010, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="11, 1, google, 01000011, 01100000011, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="12, 1, walmart, 01000012, 01100000012, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="13, 1, amazon, 01000013, 01100000013, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="14, 1, apple, 01000014, 01100000014, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="15, 1, microsoft, 01000015, 01100000015, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="16, 1, dell, 01000016, 01100000016, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="17, 1, johnson, 01000017, 01100000017, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="18, 1, intel, 01000018, 01100000018, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="19, 1, hp, 01000019, 01100000019, 2017-08-08" />
+ <row data-node="encrypt_shadow_db.t_merchant" values="20, 1, tesla, 01000020, 01100000020, 2017-08-08" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/h2/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/h2/01-actual-init.sql
index 16e0b3e7538..51236d3f8f1 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/h2/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/h2/01-actual-init.sql
@@ -15,5 +15,7 @@
-- limitations under the License.
--
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/mysql/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/mysql/01-actual-init.sql
index 12c74518f19..8ebb2a97efc 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/mysql/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/mysql/01-actual-init.sql
@@ -22,8 +22,10 @@ DROP DATABASE IF EXISTS db;
CREATE DATABASE db;
CREATE TABLE db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_db;
CREATE DATABASE encrypt_shadow_db;
CREATE TABLE encrypt_shadow_db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/opengauss/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/opengauss/01-actual-init.sql
index e6067b58c20..2e93feb353c 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/opengauss/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -24,15 +24,19 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt_shadow_db TO test_user;
\c db
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
\c encrypt_shadow_db
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/oracle/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/oracle/01-actual-init.sql
index 3c2dad2b10c..4a3892bc270 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/oracle/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/oracle/01-actual-init.sql
@@ -19,9 +19,11 @@ DROP SCHEMA db;
CREATE SCHEMA db;
CREATE TABLE db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP SCHEMA encrypt_shadow_db;
CREATE SCHEMA encrypt_shadow_db;
CREATE TABLE encrypt_shadow_db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/postgresql/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/postgresql/01-actual-init.sql
index e6067b58c20..2e93feb353c 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/postgresql/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -24,15 +24,19 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt_shadow_db TO test_user;
\c db
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
\c encrypt_shadow_db
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/sqlserver/01-actual-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/sqlserver/01-actual-init.sql
index d4ebd6bda55..5c094d4b90f 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/sqlserver/01-actual-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/actual/init-sql/sqlserver/01-actual-init.sql
@@ -19,9 +19,10 @@ DROP DATABASE IF EXISTS db;
CREATE DATABASE db;
CREATE TABLE db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
-
+CREATE TABLE db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_db;
CREATE DATABASE encrypt_shadow_db;
CREATE TABLE encrypt_shadow_db.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name_cipher VARCHAR(200) NOT NULL, order_name_plain VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_db.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/dataset.xml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/dataset.xml
index 2d5f19bd787..021eaf425bc 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/dataset.xml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/dataset.xml
@@ -29,14 +29,62 @@
<column name="type_time" type="time" />
<column name="type_timestamp" type="timestamp" />
</metadata>
+ <metadata data-nodes="prod_dataset.t_merchant,encrypt_shadow_dataset.t_merchant">
+ <column name="merchant_id" type="numeric" />
+ <column name="country_id" type="numeric" />
+ <column name="merchant_name" type="varchar" />
+ <column name="business_code" type="varchar" />
+ <column name="telephone" type="varchar" />
+ <column name="creation_date" type="datetime" />
+ </metadata>
<row data-node="prod_dataset.t_shadow" values="1, 1, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="prod_dataset.t_shadow" values="2, 1, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="prod_dataset.t_shadow" values="3, 1, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="prod_dataset.t_shadow" values="4, 1, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="prod_dataset.t_shadow" values="5, 1, pro_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
+ <row data-node="prod_dataset.t_merchant" values="1, 86, tencent, 86000001, 86100000001, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="2, 86, haier, 86000002, 86100000002, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="3, 86, huawei, 86000003, 86100000003, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="4, 86, alibaba, 86000004, 86100000004, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="5, 86, lenovo, 86000005, 86100000005, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="6, 86, moutai, 86000006, 86100000006, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="7, 86, baidu, 86000007, 86100000007, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="8, 86, xiaomi, 86000008, 86100000008, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="9, 86, vivo, 86000009, 86100000009, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="10, 86, oppo, 86000010, 86100000010, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="11, 1, google, 01000011, 01100000011, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="12, 1, walmart, 01000012, 01100000012, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="13, 1, amazon, 01000013, 01100000013, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="14, 1, apple, 01000014, 01100000014, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="15, 1, microsoft, 01000015, 01100000015, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="16, 1, dell, 01000016, 01100000016, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="17, 1, johnson, 01000017, 01100000017, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="18, 1, intel, 01000018, 01100000018, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="19, 1, hp, 01000019, 01100000019, 2017-08-08" />
+ <row data-node="prod_dataset.t_merchant" values="20, 1, tesla, 01000020, 01100000020, 2017-08-08" />
<row data-node="encrypt_shadow_dataset.t_shadow" values="1, 0, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_dataset.t_shadow" values="2, 0, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_dataset.t_shadow" values="3, 0, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_dataset.t_shadow" values="4, 0, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
<row data-node="encrypt_shadow_dataset.t_shadow" values="5, 0, shadow_order, S, true, 5, summer, 10.00, 2017-08-08, 18:30:30, 2017-08-08 18:30:30.0" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="1, 86, tencent, 86000001, 86100000001, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="2, 86, haier, 86000002, 86100000002, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="3, 86, huawei, 86000003, 86100000003, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="4, 86, alibaba, 86000004, 86100000004, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="5, 86, lenovo, 86000005, 86100000005, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="6, 86, moutai, 86000006, 86100000006, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="7, 86, baidu, 86000007, 86100000007, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="8, 86, xiaomi, 86000008, 86100000008, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="9, 86, vivo, 86000009, 86100000009, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="10, 86, oppo, 86000010, 86100000010, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="11, 1, google, 01000011, 01100000011, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="12, 1, walmart, 01000012, 01100000012, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="13, 1, amazon, 01000013, 01100000013, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="14, 1, apple, 01000014, 01100000014, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="15, 1, microsoft, 01000015, 01100000015, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="16, 1, dell, 01000016, 01100000016, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="17, 1, johnson, 01000017, 01100000017, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="18, 1, intel, 01000018, 01100000018, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="19, 1, hp, 01000019, 01100000019, 2017-08-08" />
+ <row data-node="encrypt_shadow_dataset.t_merchant" values="20, 1, tesla, 01000020, 01100000020, 2017-08-08" />
</dataset>
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/h2/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/h2/01-expected-init.sql
index 5a0798c11db..83eb58faa14 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/h2/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/h2/01-expected-init.sql
@@ -16,5 +16,7 @@
--
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/mysql/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/mysql/01-expected-init.sql
index e29d4e6cedd..914ff43648a 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/mysql/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/mysql/01-expected-init.sql
@@ -23,9 +23,11 @@ DROP DATABASE IF EXISTS prod_dataset;
CREATE DATABASE prod_dataset;
CREATE TABLE prod_dataset.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE prod_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_dataset;
CREATE DATABASE encrypt_shadow_dataset;
CREATE TABLE encrypt_shadow_dataset.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/opengauss/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/opengauss/01-expected-init.sql
index 85e2a4a734c..d15b7e6d8b7 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/opengauss/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -23,9 +23,11 @@ GRANT ALL PRIVILEGES ON DATABASE prod_dataset TO test_user;
\c prod_dataset;
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_dataset;
@@ -36,6 +38,8 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt_shadow_dataset TO test_user;
\c encrypt_shadow_dataset;
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/oracle/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/oracle/01-expected-init.sql
index 4beb4b81810..d8f2b339bed 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/oracle/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/oracle/01-expected-init.sql
@@ -19,9 +19,10 @@ DROP SCHEMA prod_dataset;
CREATE SCHEMA prod_dataset;
CREATE TABLE prod_dataset.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
-
+CREATE TABLE prod_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP SCHEMA encrypt_shadow_dataset;
CREATE SCHEMA encrypt_shadow_dataset;
CREATE TABLE encrypt_shadow_dataset.t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/postgresql/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/postgresql/01-expected-init.sql
index 85e2a4a734c..501aeb79006 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/postgresql/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/postgresql/01-expected-init.sql
@@ -23,10 +23,11 @@ GRANT ALL PRIVILEGES ON DATABASE prod_dataset TO test_user;
\c prod_dataset;
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
-
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_dataset;
CREATE DATABASE encrypt_shadow_dataset;
@@ -36,6 +37,8 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt_shadow_dataset TO test_user;
\c encrypt_shadow_dataset;
DROP TABLE IF EXISTS t_shadow;
+DROP TABLE IF EXISTS t_merchant;
CREATE TYPE season AS ENUM ('spring', 'summer', 'autumn', 'winter');
CREATE TABLE t_shadow (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum season DEFAULT 'summer', type_decimal NUMERIC(18,2) DEFAULT NULL, type_date DATE DEFAULT NULL, type_time TIME DEFAULT NULL, type_timestamp TIMESTAMP DEFAULT NULL, PRIMARY KEY (order_id));
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/sqlserver/01-expected-init.sql b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/sqlserver/01-expected-init.sql
index 4459e2e01d9..099b9045163 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/sqlserver/01-expected-init.sql
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/data/expected/init-sql/sqlserver/01-expected-init.sql
@@ -19,9 +19,10 @@ DROP DATABASE IF EXISTS prod_dataset;
CREATE DATABASE prod_dataset;
CREATE TABLE prod_dataset.encrypt_shadow_dataset (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
-
+CREATE TABLE prod_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
DROP DATABASE IF EXISTS encrypt_shadow_dataset;
CREATE DATABASE encrypt_shadow_dataset;
CREATE TABLE encrypt_shadow_dataset.encrypt_shadow_dataset (order_id BIGINT NOT NULL, user_id INT NOT NULL, order_name VARCHAR(200) NOT NULL, type_char CHAR(1) NOT NULL, type_boolean BOOLEAN NOT NULL, type_smallint SMALLINT NOT NULL, type_enum ENUM('spring', 'summer', 'autumn', 'winter'), type_decimal DECIMAL(18,2) NOT NULL, type_date DATE NOT NULL, type_time TIME NOT NULL, type_timestamp TIMESTAMP NOT NULL, PRIMARY KEY (order_id));
+CREATE TABLE encrypt_shadow_dataset.t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code VARCHAR(50) NOT NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/mysql/config-encrypt-shadow.yaml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/mysql/config-encrypt-shadow.yaml
index a0da35e1240..1a048928d40 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/mysql/config-encrypt-shadow.yaml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/mysql/config-encrypt-shadow.yaml
@@ -53,6 +53,15 @@ rules:
- user-id-delete-match-algorithm
- user-id-select-match-algorithm
- simple-hint-algorithm
+ t_merchant:
+ dataSourceNames:
+ - shadowDataSource
+ shadowAlgorithmNames:
+ - merchant-id-insert-match-algorithm
+ - merchant-id-update-match-algorithm
+ - merchant-id-delete-match-algorithm
+ - merchant-id-select-match-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
type: VALUE_MATCH
@@ -82,6 +91,30 @@ rules:
type: SIMPLE_HINT
props:
foo: bar
+ merchant-id-insert-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: insert
+ column: merchant_id
+ value: 0
+ merchant-id-update-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: update
+ column: merchant_id
+ value: 0
+ merchant-id-delete-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: delete
+ column: merchant_id
+ value: 0
+ merchant-id-select-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: select
+ column: merchant_id
+ value: 0
- !ENCRYPT
encryptors:
@@ -96,3 +129,13 @@ rules:
plainColumn: order_name_plain
cipherColumn: order_name_cipher
encryptorName: aes_encryptor
+ t_merchant:
+ columns:
+ business_code:
+ plainColumn: business_code_plain
+ cipherColumn: business_code_cipher
+ encryptorName: aes_encryptor
+ telephone:
+ plainColumn: telephone_plain
+ cipherColumn: telephone_cipher
+ encryptorName: aes_encryptor
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/opengauss/config-encrypt-shadow.yaml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/opengauss/config-encrypt-shadow.yaml
index 1af5218c76b..da42175a708 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/opengauss/config-encrypt-shadow.yaml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/opengauss/config-encrypt-shadow.yaml
@@ -53,6 +53,15 @@ rules:
- user-id-delete-match-algorithm
- user-id-select-match-algorithm
- simple-hint-algorithm
+ t_merchant:
+ dataSourceNames:
+ - shadowDataSource
+ shadowAlgorithmNames:
+ - merchant-id-insert-match-algorithm
+ - merchant-id-update-match-algorithm
+ - merchant-id-delete-match-algorithm
+ - merchant-id-select-match-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
type: VALUE_MATCH
@@ -82,6 +91,30 @@ rules:
type: SIMPLE_HINT
props:
foo: bar
+ merchant-id-insert-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: insert
+ column: merchant_id
+ value: 0
+ merchant-id-update-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: update
+ column: merchant_id
+ value: 0
+ merchant-id-delete-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: delete
+ column: merchant_id
+ value: 0
+ merchant-id-select-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: select
+ column: merchant_id
+ value: 0
- !ENCRYPT
encryptors:
aes_encryptor:
@@ -95,3 +128,13 @@ rules:
plainColumn: order_name_plain
cipherColumn: order_name_cipher
encryptorName: aes_encryptor
+ t_merchant:
+ columns:
+ business_code:
+ plainColumn: business_code_plain
+ cipherColumn: business_code_cipher
+ encryptorName: aes_encryptor
+ telephone:
+ plainColumn: telephone_plain
+ cipherColumn: telephone_cipher
+ encryptorName: aes_encryptor
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/postgresql/config-encrypt-shadow.yaml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/postgresql/config-encrypt-shadow.yaml
index 8bf953eb570..8bb37e4f2a2 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/postgresql/config-encrypt-shadow.yaml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/proxy/conf/postgresql/config-encrypt-shadow.yaml
@@ -53,6 +53,15 @@ rules:
- user-id-delete-match-algorithm
- user-id-select-match-algorithm
- simple-hint-algorithm
+ t_merchant:
+ dataSourceNames:
+ - shadowDataSource
+ shadowAlgorithmNames:
+ - merchant-id-insert-match-algorithm
+ - merchant-id-update-match-algorithm
+ - merchant-id-delete-match-algorithm
+ - merchant-id-select-match-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
type: VALUE_MATCH
@@ -82,6 +91,30 @@ rules:
type: SIMPLE_HINT
props:
foo: bar
+ merchant-id-insert-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: insert
+ column: merchant_id
+ value: 0
+ merchant-id-update-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: update
+ column: merchant_id
+ value: 0
+ merchant-id-delete-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: delete
+ column: merchant_id
+ value: 0
+ merchant-id-select-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: select
+ column: merchant_id
+ value: 0
- !ENCRYPT
encryptors:
aes_encryptor:
@@ -95,3 +128,13 @@ rules:
plainColumn: order_name_plain
cipherColumn: order_name_cipher
encryptorName: aes_encryptor
+ t_merchant:
+ columns:
+ business_code:
+ plainColumn: business_code_plain
+ cipherColumn: business_code_cipher
+ encryptorName: aes_encryptor
+ telephone:
+ plainColumn: telephone_plain
+ cipherColumn: telephone_cipher
+ encryptorName: aes_encryptor
diff --git a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/rules.yaml b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
index 70dddf1ca10..0a6f4834f2e 100644
--- a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
+++ b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt_shadow/rules.yaml
@@ -31,6 +31,15 @@ rules:
- user-id-delete-match-algorithm
- user-id-select-match-algorithm
- simple-hint-algorithm
+ t_merchant:
+ dataSourceNames:
+ - shadowDataSource
+ shadowAlgorithmNames:
+ - merchant-id-insert-match-algorithm
+ - merchant-id-update-match-algorithm
+ - merchant-id-delete-match-algorithm
+ - merchant-id-select-match-algorithm
+ - simple-hint-algorithm
shadowAlgorithms:
user-id-insert-match-algorithm:
type: VALUE_MATCH
@@ -60,7 +69,31 @@ rules:
type: SIMPLE_HINT
props:
foo: bar
-
+ merchant-id-insert-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: insert
+ column: merchant_id
+ value: 0
+ merchant-id-update-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: update
+ column: merchant_id
+ value: 0
+ merchant-id-delete-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: delete
+ column: merchant_id
+ value: 0
+ merchant-id-select-match-algorithm:
+ type: VALUE_MATCH
+ props:
+ operation: select
+ column: merchant_id
+ value: 0
+
- !ENCRYPT
encryptors:
aes_encryptor:
@@ -74,3 +107,13 @@ rules:
plainColumn: order_name_plain
cipherColumn: order_name_cipher
encryptorName: aes_encryptor
+ t_merchant:
+ columns:
+ business_code:
+ plainColumn: business_code_plain
+ cipherColumn: business_code_cipher
+ encryptorName: aes_encryptor
+ telephone:
+ plainColumn: telephone_plain
+ cipherColumn: telephone_cipher
+ encryptorName: aes_encryptor