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 f6995c85747 Add t_merchant standard table in encrypt scenario (#22481)
f6995c85747 is described below
commit f6995c857474db8e72bfbc88d98d9c2b11cc3130
Author: ICannerxy <[email protected]>
AuthorDate: Mon Nov 28 19:48:54 2022 +0800
Add t_merchant standard table in encrypt scenario (#22481)
* Add t_merchant standard table in encrypt scenario
* Fix ci
* Fix ci
* Fix ci
* Fix ci
---
.../dataset/encrypt/count_single_table_rule.xml | 2 +-
.../rql/dataset/encrypt/show_encrypt_rules.xml | 2 ++
.../rql/dataset/encrypt/show_single_tables.xml | 1 +
.../env/scenario/encrypt/data/actual/dataset.xml | 28 ++++++++++++++++++++++
.../data/actual/init-sql/h2/01-actual-init.sql | 2 ++
.../data/actual/init-sql/mysql/01-actual-init.sql | 1 +
.../actual/init-sql/opengauss/01-actual-init.sql | 2 ++
.../data/actual/init-sql/oracle/01-actual-init.sql | 1 +
.../actual/init-sql/postgresql/01-actual-init.sql | 2 ++
.../actual/init-sql/sqlserver/01-actual-init.sql | 1 +
.../env/scenario/encrypt/data/expected/dataset.xml | 28 ++++++++++++++++++++++
.../data/expected/init-sql/h2/01-expected-init.sql | 2 ++
.../expected/init-sql/mysql/01-expected-init.sql | 1 +
.../init-sql/opengauss/01-expected-init.sql | 3 ++-
.../expected/init-sql/oracle/01-expected-init.sql | 1 +
.../init-sql/postgresql/01-expected-init.sql | 3 ++-
.../init-sql/sqlserver/01-expected-init.sql | 1 +
.../encrypt/proxy/conf/mysql/config-encrypt.yaml | 11 +++++++++
.../proxy/conf/opengauss/config-encrypt.yaml | 11 +++++++++
.../proxy/conf/postgresql/config-encrypt.yaml | 10 ++++++++
.../test/resources/env/scenario/encrypt/rules.yaml | 10 ++++++++
21 files changed, 120 insertions(+), 3 deletions(-)
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
index 6222da24db8..b9874c89eec 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/count_single_table_rule.xml
@@ -21,5 +21,5 @@
<column name="database" />
<column name="count" />
</metadata>
- <row values="single_table| encrypt| 3" />
+ <row values="single_table| encrypt| 4" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
index be1fee8bb71..0cb21d4bc37 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
@@ -33,4 +33,6 @@
<row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
<row values="t_user_details| number| | number_cipher| | number_plain| | |
| AES| aes-key-value=123456abc| true" />
<row values="t_user_details| number_new| | number_new_cipher| |
number_new_plain| | | | AES| aes-key-value=123456abc| true" />
+ <row values="t_merchant| business_code| | business_code_cipher| |
business_code_plain| | | | AES| aes-key-value=123456abc| true" />
+ <row values="t_merchant| telephone| | telephone_cipher| | telephone_plain|
| | | AES| aes-key-value=123456abc| true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
index 4210bece628..aa82d8b4880 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
@@ -20,6 +20,7 @@
<column name="table_name" />
<column name="resource_name" />
</metadata>
+ <row values="t_merchant| encrypt" />
<row values="t_single_table| encrypt" />
<row values="t_user| encrypt" />
<row values="t_user_item| encrypt" />
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
index 70f9464f414..bbaa21298ff 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
@@ -34,6 +34,14 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
+ <metadata data-nodes="encrypt.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="encrypt.t_single_table" values="1, 10, init" />
<row data-node="encrypt.t_single_table" values="2, 11, init" />
<row data-node="encrypt.t_single_table" values="3, 12, init" />
@@ -62,4 +70,24 @@
<row data-node="encrypt.t_user_item" values="270000, 27, init, 2017-08-08"
/>
<row data-node="encrypt.t_user_item" values="280000, 28, init, 2017-08-08"
/>
<row data-node="encrypt.t_user_item" values="290000, 29, init, 2017-08-08"
/>
+ <row data-node="encrypt.t_merchant" values="1, 86, tencent, 86000001,
86100000001, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="2, 86, haier, 86000002,
86100000002, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="3, 86, huawei, 86000003,
86100000003, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="4, 86, alibaba, 86000004,
86100000004, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="5, 86, lenovo, 86000005,
86100000005, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="6, 86, moutai, 86000006,
86100000006, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="7, 86, baidu, 86000007,
86100000007, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="8, 86, xiaomi, 86000008,
86100000008, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="9, 86, vivo, 86000009,
86100000009, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="10, 86, oppo, 86000010,
86100000010, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="11, 1, google, 01000011,
01100000011, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="12, 1, walmart, 01000012,
01100000012, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="13, 1, amazon, 01000013,
01100000013, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="14, 1, apple, 01000014,
01100000014, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="15, 1, microsoft, 01000015,
01100000015, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="16, 1, dell, 01000016,
01100000016, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="17, 1, johnson, 01000017,
01100000017, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="18, 1, intel, 01000018,
01100000018, 2017-08-08" />
+ <row data-node="encrypt.t_merchant" values="19, 1, hp, 01000019,
01100000019, 2017-08-08" />
+ <row data-node="encrypt.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/data/actual/init-sql/h2/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
index 002aae62128..6e321c46399 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
@@ -17,9 +17,11 @@
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd_plain
VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY
KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
index 9a775be636f..d2b0a5f07d6 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
@@ -24,5 +24,6 @@ CREATE DATABASE encrypt;
CREATE TABLE encrypt.t_user (user_id INT NOT NULL, address_id INT NOT NULL,
pwd_plain VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45)
NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt.t_user_item (item_id INT NOT NULL, user_id INT NOT NULL,
status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE encrypt.t_single_table (single_id INT NOT NULL, id INT NOT NULL,
status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE encrypt.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);
CREATE INDEX user_index_t_user ON encrypt.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
index afa1a28bfe9..747e56dc354 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -24,9 +24,11 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt TO test_user;
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd_plain
VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY
KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/oracle/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/oracle/01-actual-init.sql
index b7228cf0855..f29386c1de7 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/oracle/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/oracle/01-actual-init.sql
@@ -21,5 +21,6 @@ CREATE SCHEMA encrypt;
CREATE TABLE encrypt.t_user (user_id INT NOT NULL, address_id INT NOT NULL,
pwd_plain VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45)
NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt.t_user_item (item_id INT NOT NULL, user_id INT NOT NULL,
status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE encrypt.t_single_table (single_id INT NOT NULL, id INT NOT NULL,
status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE encrypt.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);
CREATE INDEX user_index_t_user ON encrypt.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
index afa1a28bfe9..747e56dc354 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -24,9 +24,11 @@ GRANT ALL PRIVILEGES ON DATABASE encrypt TO test_user;
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd_plain
VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY
KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/sqlserver/01-actual-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/sqlserver/01-actual-init.sql
index f595a9eb8f8..a2503b86994 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/sqlserver/01-actual-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/actual/init-sql/sqlserver/01-actual-init.sql
@@ -21,5 +21,6 @@ CREATE DATABASE encrypt;
CREATE TABLE encrypt.t_user (user_id INT NOT NULL, address_id INT NOT NULL,
pwd_plain VARCHAR(45) NULL, pwd_cipher VARCHAR(45) NULL, status VARCHAR(45)
NULL, PRIMARY KEY (user_id));
CREATE TABLE encrypt.t_user_item (item_id INT NOT NULL, user_id INT NOT NULL,
status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE encrypt.t_single_table (single_id INT NOT NULL, id INT NOT NULL,
status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE encrypt.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);
CREATE INDEX user_index_t_user ON encrypt.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/dataset.xml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/dataset.xml
index 539c610cfb5..16d24843f8f 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/dataset.xml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/dataset.xml
@@ -33,6 +33,14 @@
<column name="id" type="numeric" />
<column name="status" type="varchar" />
</metadata>
+ <metadata data-nodes="expected_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="expected_dataset.t_single_table" values="1, 10, init" />
<row data-node="expected_dataset.t_single_table" values="2, 11, init" />
<row data-node="expected_dataset.t_single_table" values="3, 12, init" />
@@ -61,4 +69,24 @@
<row data-node="expected_dataset.t_user_item" values="270000, 27, init,
2017-08-08" />
<row data-node="expected_dataset.t_user_item" values="280000, 28, init,
2017-08-08" />
<row data-node="expected_dataset.t_user_item" values="290000, 29, init,
2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="1, 86, tencent,
86000001, 86100000001, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="2, 86, haier,
86000002, 86100000002, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="3, 86, huawei,
86000003, 86100000003, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="4, 86, alibaba,
86000004, 86100000004, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="5, 86, lenovo,
86000005, 86100000005, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="6, 86, moutai,
86000006, 86100000006, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="7, 86, baidu,
86000007, 86100000007, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="8, 86, xiaomi,
86000008, 86100000008, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="9, 86, vivo,
86000009, 86100000009, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="10, 86, oppo,
86000010, 86100000010, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="11, 1, google,
01000011, 01100000011, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="12, 1, walmart,
01000012, 01100000012, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="13, 1, amazon,
01000013, 01100000013, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="14, 1, apple,
01000014, 01100000014, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="15, 1, microsoft,
01000015, 01100000015, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="16, 1, dell,
01000016, 01100000016, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="17, 1, johnson,
01000017, 01100000017, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="18, 1, intel,
01000018, 01100000018, 2017-08-08" />
+ <row data-node="expected_dataset.t_merchant" values="19, 1, hp, 01000019,
01100000019, 2017-08-08" />
+ <row data-node="expected_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/data/expected/init-sql/h2/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/h2/01-expected-init.sql
index 8cd3191a11a..4db15afda00 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/h2/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/h2/01-expected-init.sql
@@ -18,9 +18,11 @@
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd
VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
index e12cae6a7ac..b9af9a3da46 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
@@ -24,5 +24,6 @@ CREATE DATABASE expected_dataset;
CREATE TABLE expected_dataset.t_user (user_id INT NOT NULL, address_id INT NOT
NULL, pwd VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE expected_dataset.t_user_item (item_id INT NOT NULL, user_id INT
NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE expected_dataset.t_single_table (single_id INT NOT NULL, id INT
NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE expected_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);
CREATE INDEX user_index_t_user ON expected_dataset.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/opengauss/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/opengauss/01-expected-init.sql
index 0213247913d..a3bc141b07a 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/opengauss/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -25,10 +25,11 @@ GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO
test_user;
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd
VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/oracle/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/oracle/01-expected-init.sql
index bd84df6b0f5..3bcf8d821d2 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/oracle/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/oracle/01-expected-init.sql
@@ -21,5 +21,6 @@ CREATE SCHEMA expected_dataset;
CREATE TABLE expected_dataset.t_user (user_id INT NOT NULL, address_id INT NOT
NULL, pwd VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE expected_dataset.t_user_item (item_id INT NOT NULL, user_id INT
NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE expected_dataset.t_single_table (single_id INT NOT NULL, id INT
NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE expected_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);
CREATE INDEX user_index_t_user ON expected_dataset.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/postgresql/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/postgresql/01-expected-init.sql
index 0213247913d..a3bc141b07a 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/postgresql/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/postgresql/01-expected-init.sql
@@ -25,10 +25,11 @@ GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO
test_user;
DROP TABLE IF EXISTS t_user;
DROP TABLE IF EXISTS t_user_item;
DROP TABLE IF EXISTS t_single_table;
+DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_user (user_id INT NOT NULL, address_id INT NOT NULL, pwd
VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE t_user_item (item_id INT NOT NULL, user_id INT NOT NULL, status
VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_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);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/sqlserver/01-expected-init.sql
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/sqlserver/01-expected-init.sql
index af873171b47..d3fc8723594 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/sqlserver/01-expected-init.sql
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/data/expected/init-sql/sqlserver/01-expected-init.sql
@@ -22,5 +22,6 @@ CREATE DATABASE expected_dataset;
CREATE TABLE expected_dataset.t_user (user_id INT NOT NULL, address_id INT NOT
NULL, pwd VARCHAR(45) NULL, status VARCHAR(45) NULL, PRIMARY KEY (user_id));
CREATE TABLE expected_dataset.t_user_item (item_id INT NOT NULL, user_id INT
NOT NULL, status VARCHAR(45) NULL, creation_date DATE, PRIMARY KEY (item_id));
CREATE TABLE expected_dataset.t_single_table (single_id INT NOT NULL, id INT
NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (single_id));
+CREATE TABLE expected_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);
CREATE INDEX user_index_t_user ON expected_dataset.t_user (user_id);
diff --git
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
index 6944d712794..5c04a251a53 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
@@ -52,3 +52,14 @@ rules:
plainColumn: number_new_plain
cipherColumn: number_new_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/proxy/conf/opengauss/config-encrypt.yaml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
index 9857b2edcb3..4cc3f5dcaed 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
@@ -52,3 +52,14 @@ rules:
plainColumn: number_new_plain
cipherColumn: number_new_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/proxy/conf/postgresql/config-encrypt.yaml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
index 6e06e4efd52..613a8d571e7 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
@@ -52,3 +52,13 @@ rules:
plainColumn: number_new_plain
cipherColumn: number_new_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/rules.yaml
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/rules.yaml
index c5e9fc78564..0e8eff9a720 100644
---
a/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/rules.yaml
+++
b/test/integration-test/test-suite/src/test/resources/env/scenario/encrypt/rules.yaml
@@ -39,3 +39,13 @@ rules:
plainColumn: number_new_plain
cipherColumn: number_new_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
