This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 ab0044bd313 SHOW ENCRYPT statement add assistedQueryAlgorithm,
likeQueryAlgorithm information display (#22561)
ab0044bd313 is described below
commit ab0044bd313f7c984cf5f351413382240698885f
Author: jiangML <1060319...@qq.com>
AuthorDate: Fri Dec 2 11:34:14 2022 +0800
SHOW ENCRYPT statement add assistedQueryAlgorithm, likeQueryAlgorithm
information display (#22561)
* Add assistedQueryAlgorithm and likeQueryAlgorithm algorithm information
* add doc and optimize code
* fix test error
* update doc
* fix test error
* fix integration test error
* format code
* update doc
* optimize code
* update doc
* update doc
* fix ci error
---
.../syntax/rdl/rule-definition/encrypt.cn.md | 10 +--
.../syntax/rdl/rule-definition/encrypt.en.md | 10 +--
.../distsql/syntax/rql/rule-query/encrypt.cn.md | 76 ++++++++++++----------
.../distsql/syntax/rql/rule-query/encrypt.en.md | 52 ++++++++-------
.../handler/query/EncryptRuleQueryResultSet.java | 13 +++-
.../query/EncryptRuleQueryResultSetTest.java | 2 +-
.../dataset/rdl_empty_rules/alter_encrypt_rule.xml | 6 +-
.../rdl_empty_rules/create_encrypt_rule.xml | 6 +-
.../dataset/rdl_empty_rules/drop_encrypt_rule.xml | 4 ++
.../show_encrypt_rule.xml | 6 +-
.../show_encrypt_rules.xml | 14 ++--
.../rql/dataset/encrypt/show_encrypt_rule.xml | 6 +-
.../rql/dataset/encrypt/show_encrypt_rules.xml | 14 ++--
.../show_encrypt_rule.xml | 6 +-
.../show_encrypt_rules.xml | 18 +++--
.../sharding_and_encrypt/show_encrypt_rule.xml | 6 +-
.../sharding_and_encrypt/show_encrypt_rules.xml | 14 ++--
17 files changed, 161 insertions(+), 102 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.cn.md
index 8ba87ffcb82..c10eafebf41 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.cn.md
@@ -57,18 +57,18 @@ algorithmProperty:
```sql
CREATE ENCRYPT RULE t_encrypt (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE')))),
-(NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))
-),QUERY_WITH_CIPHER_COLUMN=true),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE'))),
+(NAME=order_id, CIPHER =order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
+), QUERY_WITH_CIPHER_COLUMN=true),
t_encrypt_2 (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,
ENCRYPT_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),
(NAME=order_id, CIPHER=order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
), QUERY_WITH_CIPHER_COLUMN=FALSE);
ALTER ENCRYPT RULE t_encrypt (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE')))),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456efc'))),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE'))),
(NAME=order_id,CIPHER=order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
), QUERY_WITH_CIPHER_COLUMN=TRUE);
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.en.md
index 88d1f7e09f9..48446e26b3d 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rdl/rule-definition/encrypt.en.md
@@ -57,18 +57,18 @@ algorithmProperty:
```sql
CREATE ENCRYPT RULE t_encrypt (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE')))),
-(NAME=order_id, CIPHER =order_cipher,TYPE(NAME='MD5'))
-),QUERY_WITH_CIPHER_COLUMN=true),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc'))),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE'))),
+(NAME=order_id, CIPHER =order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
+), QUERY_WITH_CIPHER_COLUMN=true),
t_encrypt_2 (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,
ENCRYPT_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')))),
(NAME=order_id, CIPHER=order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
), QUERY_WITH_CIPHER_COLUMN=FALSE);
ALTER ENCRYPT RULE t_encrypt (
COLUMNS(
-(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456abc')),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE')))),
+(NAME=user_id,PLAIN=user_plain,CIPHER=user_cipher,ASSISTED_QUERY_COLUMN=user_assisted,LIKE_QUERY_COLUMN=user_like,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')),ASSISTED_QUERY_ALGORITHM(TYPE(NAME='AES',PROPERTIES('aes-key-value'='123456efc'))),LIKE_QUERY_ALGORITHM(TYPE(NAME='CHAR_DIGEST_LIKE'))),
(NAME=order_id,CIPHER=order_cipher,ENCRYPT_ALGORITHM(TYPE(NAME='MD5')))
), QUERY_WITH_CIPHER_COLUMN=TRUE);
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
index 851765ea0e6..e1f2ec9a1d0 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.cn.md
@@ -15,53 +15,57 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
## 返回值说明
| 列 | 说明 |
-| ------------------------- | ------------------ |
-| table | 逻辑表名 |
-| logic_column | 逻辑列名 |
-| logic_data_type | 逻辑列数据类型 |
-| cipher_column | 密文列名 |
-| cipher_data_type | 密文列数据类型 |
-| plain_column | 明文列名 |
-| plain_data_type | 明文列数据类型 |
-| assisted_query_column | 辅助查询列名 |
-| assisted_query_data_type | 辅助查询列数据类型 |
-| encryptor_type | 加密算法类型 |
-| encryptor_props | 加密算法参数 |
-| query_with_cipher_column | 是否使用加密列进行查询 |
+|--------------------------| ------------------ |
+| table | 逻辑表名 |
+| logic_column | 逻辑列名 |
+| logic_data_type | 逻辑列数据类型 |
+| cipher_column | 密文列名 |
+| cipher_data_type | 密文列数据类型 |
+| plain_column | 明文列名 |
+| plain_data_type | 明文列数据类型 |
+| assisted_query_column | 辅助查询列名 |
+| assisted_query_data_type | 辅助查询列数据类型 |
+| encryptor_type | 加密算法类型 |
+| encryptor_props | 加密算法参数 |
+| assisted_query_type | 辅助查询算法类型 |
+| assisted_query_props | 辅助查询算法参数 |
+| like_query_type | 模糊查询算法类型 |
+| like_query_props | 模糊查询算法参数 |
+| query_with_cipher_column | 是否使用加密列进行查询 |
## 示例
*显示加密规则*
```sql
mysql> SHOW ENCRYPT RULES FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.78 sec)
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true
|
+| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | |
| | | false
|
+| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | false
|
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+4 rows in set (0.02 sec)
```
*显示加密表规则表名*
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.01 sec)
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+2 rows in set (0.11 sec)
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.01 sec))
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+2 rows in set (0.02 sec)
```
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
index 1d4100642ad..40c1701ec50 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/rql/rule-query/encrypt.en.md
@@ -15,7 +15,7 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
## Return Value Description
| Column | Description |
-| ------------------------- | ---------------------------------------- |
+| ------------------------- |-------------------------------------------|
| table | Logical table name |
| logic_column | Logical column name |
| logic_data_type | Logical column data type |
@@ -27,6 +27,10 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
| assisted_query_data_type | Assisted query column data type |
| encryptor_type | Encryption algorithm type |
| encryptor_props | Encryption algorithm parameter |
+| assisted_query_type | Assisted query algorithm type |
+| assisted_query_props | Assisted query algorithm parameter |
+| like_query_type | Like query algorithm type |
+| like_query_props | Like query algorithm parameter |
| query_with_cipher_column | Whether to use encrypted column for query |
## Example
@@ -34,34 +38,34 @@ SHOW ENCRYPT TABLE RULE tableName [FROM databaseName]
*Show Encrypt Rules*
```sql
mysql> SHOW ENCRYPT RULES FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | false |
-| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | false |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-4 rows in set (0.78 sec)
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true
|
+| t_encrypt_2 | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | |
| | | false
|
+| t_encrypt_2 | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | false
|
++-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+4 rows in set (0.02 sec)
```
*Show Encrypt Table Rule Table Name*
```sql
mysql> SHOW ENCRYPT TABLE RULE t_encrypt;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.01 sec)
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+2 rows in set (0.11 sec)
mysql> SHOW ENCRYPT TABLE RULE t_encrypt FROM encrypt_db;
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
query_with_cipher_column |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-| t_encrypt | user_id | | user_cipher |
| user_plain | | |
| AES | aes-key-value=123456abc | true |
-| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | true |
-+-------------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-------------------------+--------------------------+
-2 rows in set (0.01 sec))
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| table | logic_column | logic_data_type | cipher_column |
cipher_data_type | plain_column | plain_data_type | assisted_query_column |
assisted_query_data_type | encryptor_type | encryptor_props |
assisted_query_type | assisted_query_props | like_query_type |
like_query_props | query_with_cipher_column |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+| t_encrypt | user_id | | user_cipher |
| user_plain | | user_assisted |
| MD5 | | AES |
aes-key-value=123456abc | CHAR_DIGEST_LIKE | | true
|
+| t_encrypt | order_id | | order_cipher |
| | | |
| MD5 | | |
| | | true |
++-----------+--------------+-----------------+---------------+------------------+--------------+-----------------+-----------------------+--------------------------+----------------+-----------------+---------------------+-------------------------+------------------+------------------+--------------------------+
+2 rows in set (0.02 sec)
```
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
index 67cb6e6d726..3aca62eedde 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
@@ -58,12 +58,18 @@ public final class EncryptRuleQueryResultSet implements
DatabaseDistSQLResultSet
private Collection<Collection<Object>> buildColumnData(final
EncryptTableRuleConfiguration tableRuleConfig, final Map<String,
AlgorithmConfiguration> algorithmMap) {
Collection<Collection<Object>> result = new LinkedList<>();
tableRuleConfig.getColumns().forEach(each -> {
- AlgorithmConfiguration algorithmConfig =
algorithmMap.get(each.getEncryptorName());
+ AlgorithmConfiguration encryptorAlgorithmConfig =
algorithmMap.get(each.getEncryptorName());
+ AlgorithmConfiguration assistedQueryEncryptorAlgorithmConfig =
algorithmMap.get(each.getAssistedQueryEncryptorName());
+ AlgorithmConfiguration likeQueryEncryptorAlgorithmConfig =
algorithmMap.get(each.getLikeQueryEncryptorName());
result.add(Arrays.asList(tableRuleConfig.getName(),
each.getLogicColumn(), nullToEmptyString(null),
each.getCipherColumn(), nullToEmptyString(null),
nullToEmptyString(each.getPlainColumn()),
nullToEmptyString(null),
nullToEmptyString(each.getAssistedQueryColumn()),
nullToEmptyString(null),
- algorithmConfig.getType(),
PropertiesConverter.convert(algorithmConfig.getProps()),
+ encryptorAlgorithmConfig.getType(),
PropertiesConverter.convert(encryptorAlgorithmConfig.getProps()),
+ Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) : assistedQueryEncryptorAlgorithmConfig.getType(),
+ Objects.isNull(assistedQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
+ Objects.isNull(likeQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) : likeQueryEncryptorAlgorithmConfig.getType(),
+ Objects.isNull(likeQueryEncryptorAlgorithmConfig) ?
nullToEmptyString(null) :
PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()),
Objects.isNull(tableRuleConfig.getQueryWithCipherColumn())
? Boolean.TRUE.toString() :
tableRuleConfig.getQueryWithCipherColumn().toString()));
});
return result;
@@ -76,7 +82,8 @@ public final class EncryptRuleQueryResultSet implements
DatabaseDistSQLResultSet
@Override
public Collection<String> getColumnNames() {
return Arrays.asList("table", "logic_column", "logic_data_type",
"cipher_column", "cipher_data_type", "plain_column", "plain_data_type",
- "assisted_query_column", "assisted_query_data_type",
"encryptor_type", "encryptor_props", "query_with_cipher_column");
+ "assisted_query_column", "assisted_query_data_type",
"encryptor_type", "encryptor_props",
+ "assisted_query_type", "assisted_query_props",
"like_query_type", "like_query_props", "query_with_cipher_column");
}
@Override
diff --git
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
index 9b6c51d6fe7..923adf69d57 100644
---
a/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
+++
b/features/encrypt/distsql/handler/src/test/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSetTest.java
@@ -48,7 +48,7 @@ public final class EncryptRuleQueryResultSetTest {
DatabaseDistSQLResultSet resultSet = new EncryptRuleQueryResultSet();
resultSet.init(database, mock(ShowEncryptRulesStatement.class));
Collection<Object> actual = resultSet.getRowData();
- assertThat(actual.size(), is(12));
+ assertThat(actual.size(), is(16));
assertTrue(actual.contains("t_encrypt"));
assertTrue(actual.contains("user_id"));
assertTrue(actual.contains("user_cipher"));
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
index 1ad36014694..343636fcae8 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/alter_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abcd| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abcd| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
index e327a3c2780..839fbe15349 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/create_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
index 12278b722a8..9cae3ecec4e 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rdl/dataset/rdl_empty_rules/drop_encrypt_rule.xml
@@ -28,6 +28,10 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
index e327a3c2780..839fbe15349 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
index e06a94ee029..8c12eeb156e 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
@@ -28,11 +28,15 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| true" />
- <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | AES| aes-key-value=123456abc| true" />
+ <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| | | | | true" />
+ <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | AES| aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
index e327a3c2780..839fbe15349 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt/show_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| | | | | true" />
</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 0cb21d4bc37..2751d158b50 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
@@ -28,11 +28,15 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <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" />
+ <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_and_readwrite_splitting/show_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
index e327a3c2780..839fbe15349 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
index dfd25b64f02..d311f5711a8 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/encrypt_and_readwrite_splitting/show_encrypt_rules.xml
@@ -28,13 +28,17 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| true" />
- <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | 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" />
+ <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| | | | | true" />
+ <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | 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/sharding_and_encrypt/show_encrypt_rule.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
index e327a3c2780..839fbe15349 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rule.xml
@@ -28,7 +28,11 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| true" />
+ <row values="t_user| pwd| | pwd_cipher| | pwd_plain| | | | AES|
aes-key-value=123456abc| | | | | true" />
</dataset>
diff --git
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
index e06a94ee029..8c12eeb156e 100644
---
a/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
+++
b/test/integration-test/test-suite/src/test/resources/cases/rql/dataset/sharding_and_encrypt/show_encrypt_rules.xml
@@ -28,11 +28,15 @@
<column name="assisted_query_data_type" />
<column name="encryptor_type" />
<column name="encryptor_props" />
+ <column name="assisted_query_type" />
+ <column name="assisted_query_props" />
+ <column name="like_query_type" />
+ <column name="like_query_props" />
<column name="query_with_cipher_column" />
</metadata>
- <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| true" />
- <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | AES| aes-key-value=123456abc| true" />
+ <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_user_encrypt_federate| pwd| | cipher_pwd| | plain_pwd| | |
| AES| aes-key-value=123456abc| | | | | true" />
+ <row values="t_user_encrypt_federate_sharding| pwd| | cipher_pwd| |
plain_pwd| | | | AES| aes-key-value=123456abc| | | | | true" />
</dataset>
