This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 d39f46b5bf4 Modify e2e encrypt column to add table name prefix (#28193)
d39f46b5bf4 is described below
commit d39f46b5bf420d14c39523c34303ac0c95205d4d
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Aug 21 11:39:40 2023 +0800
Modify e2e encrypt column to add table name prefix (#28193)
* Modify e2e encrypt column to add table name prefix
* fix unit test
* fix e2e test
---
.../apache/shardingsphere/mode/manager/ContextManagerTest.java | 5 +++--
.../cases/dml/dataset/encrypt/batch_insert_into_user_table.xml | 4 ++--
.../resources/cases/dml/dataset/encrypt/delete_user_table.xml | 4 ++--
.../resources/cases/dml/dataset/encrypt/update_user_table.xml | 4 ++--
.../cases/dml/dataset/encrypt/update_user_table_by_pwd.xml | 4 ++--
.../resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml | 2 +-
.../resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml | 4 ++--
.../test/resources/env/scenario/encrypt/data/actual/dataset.xml | 8 ++++----
.../scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql | 4 ++--
.../encrypt/data/actual/init-sql/mysql/01-actual-init.sql | 4 ++--
.../encrypt/data/actual/init-sql/opengauss/01-actual-init.sql | 4 ++--
.../encrypt/data/actual/init-sql/postgresql/01-actual-init.sql | 4 ++--
.../env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml | 8 ++++----
.../env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml | 8 ++++----
.../scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml | 8 ++++----
test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml | 8 ++++----
16 files changed, 42 insertions(+), 41 deletions(-)
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
index e4bc5282954..5a7c916780d 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerTest.java
@@ -24,12 +24,12 @@ import
org.apache.shardingsphere.infra.database.core.DefaultDatabase;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.datanode.DataNode;
import
org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
-import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageNode;
-import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageResourceUtils;
import org.apache.shardingsphere.infra.instance.InstanceContext;
import org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
+import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageNode;
+import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageResourceUtils;
import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageUnit;
import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageUnitMetaData;
import
org.apache.shardingsphere.infra.metadata.database.resource.storage.StorageUnitNodeMapper;
@@ -104,6 +104,7 @@ class ContextManagerTest {
when(mutableDataNodeRule.findTableDataNode("foo_schema",
"foo_tbl")).thenReturn(Optional.of(mock(DataNode.class)));
when(result.getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.singleton(mutableDataNodeRule)));
when(result.getSchemas()).thenReturn(new
HashMap<>(Collections.singletonMap("foo_schema", new ShardingSphereSchema())));
+
when(result.getResourceMetaData().getStorageUnitMetaData().getStorageTypes()).thenReturn(Collections.singletonMap("ds_0",
TypedSPILoader.getService(DatabaseType.class, "FIXTURE")));
return result;
}
diff --git
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/batch_insert_into_user_table.xml
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/batch_insert_into_user_table.xml
index 0f7b3818e3e..c9d0c408b9b 100644
---
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/batch_insert_into_user_table.xml
+++
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/batch_insert_into_user_table.xml
@@ -22,8 +22,8 @@
<column name="user_name_like" type="varchar" />
<column name="password_cipher" type="varchar" />
<column name="email_cipher" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="user_telephone_cipher" type="varchar" />
+ <column name="user_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<row data-node="encrypt.t_user" values="10, sVq8Lmm+j6bZE5EKSilJEQ==,
yi`mht`m, aQol0b6th65d0aXe+zFPsQ==,
WM0fHOH91JNWnHTkiqBdyNmzk4uJ7CCz4mB1va9Ya1M=, kLjLJIMnfyHT2nA+viaoaQ==,
01454589811, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
index 51c6f01f8a4..99cd87c70e0 100644
---
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
+++
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/delete_user_table.xml
@@ -22,8 +22,8 @@
<column name="user_name_like" type="varchar" />
<column name="password_cipher" type="varchar" />
<column name="email_cipher" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="user_telephone_cipher" type="varchar" />
+ <column name="user_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<row data-node="encrypt.t_user" values="11, fQ7IzBxKVuNHtUF6h6WSBg==,
mhth, wuhmEKgdgrWQYt+Ev0hgGA==, svATu3uWv9KfiloWJeWx3A==,
0kDFxndQdzauFwL/wyCsNQ==, 01454589810, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
index cebea5bbaa5..fa6008618e0 100644
---
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
+++
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table.xml
@@ -22,8 +22,8 @@
<column name="user_name_like" type="varchar" />
<column name="password_cipher" type="varchar" />
<column name="email_cipher" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="user_telephone_cipher" type="varchar" />
+ <column name="user_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<row data-node="encrypt.t_user" values="10, sVq8Lmm+j6bZE5EKSilJEQ==,
yi`mht`m, wuhmEKgdgrWQYt+Ev0hgGA==,
WM0fHOH91JNWnHTkiqBdyNmzk4uJ7CCz4mB1va9Ya1M=, kLjLJIMnfyHT2nA+viaoaQ==,
01454589811, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
index 23c8099caff..6c5117913ab 100644
---
a/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
+++
b/test/e2e/sql/src/test/resources/cases/dml/dataset/encrypt/update_user_table_by_pwd.xml
@@ -22,8 +22,8 @@
<column name="user_name_like" type="varchar" />
<column name="password_cipher" type="varchar" />
<column name="email_cipher" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="user_telephone_cipher" type="varchar" />
+ <column name="user_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<row data-node="encrypt.t_user" values="10, sVq8Lmm+j6bZE5EKSilJEQ==,
yi`mht`m, aQol0b6th65d0aXe+zFPsQ==,
WM0fHOH91JNWnHTkiqBdyNmzk4uJ7CCz4mB1va9Ya1M=, 0kDFxndQdzauFwL/wyCsNQ==,
01454589810, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
index a142eba7481..b1b7460494b 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
@@ -32,5 +32,5 @@
<row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
aes-key-value=123456abc| | | CHAR_DIGEST_LIKE| mask=4093" />
<row values="t_user| password| password_cipher| | | AES|
aes-key-value=123456abc| | | | " />
<row values="t_user| email| email_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| telephone| telephone_cipher| | telephone_like| AES|
aes-key-value=123456abc| | | CHAR_DIGEST_LIKE| mask=4093" />
+ <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE|
mask=4093" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
index 2fc83739337..488e8d0e859 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rules.xml
@@ -32,9 +32,9 @@
<row values="t_user| user_name| user_name_cipher| | user_name_like| AES|
aes-key-value=123456abc| | | CHAR_DIGEST_LIKE| mask=4093" />
<row values="t_user| password| password_cipher| | | AES|
aes-key-value=123456abc| | | | " />
<row values="t_user| email| email_cipher| | | AES|
aes-key-value=123456abc| | | | " />
- <row values="t_user| telephone| telephone_cipher| | telephone_like| AES|
aes-key-value=123456abc| | | CHAR_DIGEST_LIKE| mask=4093" />
+ <row values="t_user| telephone| user_telephone_cipher| |
user_telephone_like| AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE|
mask=4093" />
<row values="t_user_details| number| number_cipher| | | AES|
aes-key-value=123456abc| | | | " />
<row values="t_user_details| number_new| number_new_cipher| | | AES|
aes-key-value=123456abc| | | | " />
<row values="t_merchant| business_code| business_code_cipher| |
business_code_like| AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE |
mask=4093 " />
- <row values="t_merchant| telephone| telephone_cipher| | telephone_like|
AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE | mask=4093 " />
+ <row values="t_merchant| telephone| merchant_telephone_cipher| |
merchant_telephone_like| AES| aes-key-value=123456abc| | | CHAR_DIGEST_LIKE |
mask=4093 " />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
index 5fd97a43f0f..20e20ee30d6 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/dataset.xml
@@ -38,8 +38,8 @@
<column name="user_name_like" type="varchar" />
<column name="password_cipher" type="varchar" />
<column name="email_cipher" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="user_telephone_cipher" type="varchar" />
+ <column name="user_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<metadata data-nodes="encrypt.t_user_item">
@@ -59,8 +59,8 @@
<column name="merchant_name" type="varchar" />
<column name="business_code_cipher" type="varchar" />
<column name="business_code_like" type="varchar" />
- <column name="telephone_cipher" type="varchar" />
- <column name="telephone_like" type="varchar" />
+ <column name="merchant_telephone_cipher" type="varchar" />
+ <column name="merchant_telephone_like" type="varchar" />
<column name="creation_date" type="datetime" />
</metadata>
<row data-node="encrypt.t_order" values="1000, 10, init, null, test,
2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
index 0225d6915fd..6cbccd24e99 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/h2/01-actual-init.sql
@@ -24,9 +24,9 @@ DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_order (order_id INT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item (item_id INT PRIMARY KEY, order_id INT NOT NULL,
user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT NULL,
telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, user_telephone_cipher CHAR(50) NOT
NULL, user_telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
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_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT
NULL, telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT
NULL, merchant_name VARCHAR(50) NOT NULL, business_code_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, merchant_telephone_cipher
CHAR(50) NOT NULL, merchant_telephone_like CHAR(11) NOT NULL, creation_date
DATE NOT NULL);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
index 95537a32f62..149b1e0b1f3 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql
@@ -23,9 +23,9 @@ CREATE DATABASE encrypt;
CREATE TABLE encrypt.t_order (order_id INT PRIMARY KEY, user_id INT NOT NULL,
status VARCHAR(50) NOT NULL, merchant_id INT, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE encrypt.t_order_item (item_id INT PRIMARY KEY, order_id INT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE encrypt.t_user (user_id INT PRIMARY KEY, user_name_cipher
VARCHAR(50) NOT NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher
VARCHAR(50) NOT NULL, email_cipher VARCHAR(50) NOT NULL, telephone_cipher
CHAR(50) NOT NULL, telephone_like CHAR(11) NOT NULL, creation_date DATE NOT
NULL);
+CREATE TABLE encrypt.t_user (user_id INT PRIMARY KEY, user_name_cipher
VARCHAR(50) NOT NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher
VARCHAR(50) NOT NULL, email_cipher VARCHAR(50) NOT NULL, user_telephone_cipher
CHAR(50) NOT NULL, user_telephone_like CHAR(11) NOT NULL, creation_date DATE
NOT NULL);
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_cipher
VARCHAR(50) NOT NULL, business_code_like VARCHAR(50) NOT NULL, telephone_cipher
CHAR(50) NOT NULL, telephone_like CHAR(11) NOT NULL, creation_date DATE NOT
NULL);
+CREATE TABLE encrypt.t_merchant (merchant_id INT PRIMARY KEY, country_id
SMALLINT NOT NULL, merchant_name VARCHAR(50) NOT NULL, business_code_cipher
VARCHAR(50) NOT NULL, business_code_like VARCHAR(50) NOT NULL,
merchant_telephone_cipher CHAR(50) NOT NULL, merchant_telephone_like 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/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
index d4cfdcc338b..b2042b2df52 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -30,9 +30,9 @@ DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_order (order_id INT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item (item_id INT PRIMARY KEY, order_id INT NOT NULL,
user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT NULL,
telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, user_telephone_cipher CHAR(50) NOT
NULL, user_telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
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_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT
NULL, telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT
NULL, merchant_name VARCHAR(50) NOT NULL, business_code_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, merchant_telephone_cipher
CHAR(50) NOT NULL, merchant_telephone_like CHAR(11) NOT NULL, creation_date
DATE NOT NULL);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
index d4cfdcc338b..b2042b2df52 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -30,9 +30,9 @@ DROP TABLE IF EXISTS t_merchant;
CREATE TABLE t_order (order_id INT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item (item_id INT PRIMARY KEY, order_id INT NOT NULL,
user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT NULL,
telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_user (user_id INT PRIMARY KEY, user_name_cipher VARCHAR(50) NOT
NULL, user_name_like VARCHAR(50) NOT NULL, password_cipher VARCHAR(50) NOT
NULL, email_cipher VARCHAR(50) NOT NULL, user_telephone_cipher CHAR(50) NOT
NULL, user_telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
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_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, telephone_cipher CHAR(50) NOT
NULL, telephone_like CHAR(11) NOT NULL, creation_date DATE NOT NULL);
+CREATE TABLE t_merchant (merchant_id INT PRIMARY KEY, country_id SMALLINT NOT
NULL, merchant_name VARCHAR(50) NOT NULL, business_code_cipher VARCHAR(50) NOT
NULL, business_code_like VARCHAR(50) NOT NULL, merchant_telephone_cipher
CHAR(50) NOT NULL, merchant_telephone_like CHAR(11) NOT NULL, creation_date
DATE NOT NULL);
CREATE INDEX user_index_t_user ON t_user (user_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
index d2f27c8fb8a..1a6b944972f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/mysql/config-encrypt.yaml
@@ -62,10 +62,10 @@ rules:
encryptorName: aes_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: user_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: user_telephone_like
encryptorName: like_encryptor
t_user_details:
columns:
@@ -88,8 +88,8 @@ rules:
encryptorName: like_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: merchant_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: merchant_telephone_like
encryptorName: like_encryptor
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
index d04fe06b1cf..89a633b9d4e 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/opengauss/config-encrypt.yaml
@@ -62,10 +62,10 @@ rules:
encryptorName: aes_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: user_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: user_telephone_like
encryptorName: like_encryptor
t_user_details:
columns:
@@ -88,8 +88,8 @@ rules:
encryptorName: like_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: merchant_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: merchant_telephone_like
encryptorName: like_encryptor
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
index 48aed704d13..9cc2b3d5382 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/proxy/conf/postgresql/config-encrypt.yaml
@@ -62,10 +62,10 @@ rules:
encryptorName: aes_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: user_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: user_telephone_like
encryptorName: like_encryptor
t_user_details:
columns:
@@ -88,8 +88,8 @@ rules:
encryptorName: like_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: merchant_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: merchant_telephone_like
encryptorName: like_encryptor
diff --git a/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
index 07222031cce..69a2ac6a6d9 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt/rules.yaml
@@ -49,10 +49,10 @@ rules:
encryptorName: aes_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: user_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: user_telephone_like
encryptorName: like_encryptor
t_user_details:
columns:
@@ -75,10 +75,10 @@ rules:
encryptorName: like_encryptor
telephone:
cipher:
- name: telephone_cipher
+ name: merchant_telephone_cipher
encryptorName: aes_encryptor
likeQuery:
- name: telephone_like
+ name: merchant_telephone_like
encryptorName: like_encryptor
props:
