This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 81a2bbab492 Fix e2e error in master branch (#27995)
81a2bbab492 is described below
commit 81a2bbab492cb564226b0f3e51b3cae414bce253
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Aug 9 10:36:18 2023 +0800
Fix e2e error in master branch (#27995)
* Fix e2e error in master branch
* add missing file for mysql e2e init sql
---
.../src/test/resources/cases/rql/dataset/encrypt/count_single_table.xml | 2 +-
.../src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml | 2 ++
.../env/scenario/encrypt/data/actual/init-sql/mysql/01-actual-init.sql | 2 ++
.../scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/count_single_table.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/count_single_table.xml
index 47431b524f9..9f645c0275c 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/count_single_table.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/count_single_table.xml
@@ -20,5 +20,5 @@
<column name="database" />
<column name="count" />
</metadata>
- <row values="encrypt| 4" />
+ <row values="encrypt| 6" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
index 5a622b8c735..1e4e0017736 100644
---
a/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
+++
b/test/e2e/sql/src/test/resources/cases/rql/dataset/encrypt/show_single_tables.xml
@@ -21,6 +21,8 @@
<column name="storage_unit_name" />
</metadata>
<row values="t_merchant| encrypt" />
+ <row values="t_order| encrypt" />
+ <row values="t_order_item| encrypt" />
<row values="t_single_table| encrypt" />
<row values="t_user| encrypt" />
<row values="t_user_item| encrypt" />
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 b64f8d9f8f2..95537a32f62 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
@@ -21,6 +21,8 @@ SET character_set_server='utf8';
DROP DATABASE IF EXISTS encrypt;
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_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));
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
index 0fd05131ccd..9c78961d1b5 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/data/expected/init-sql/mysql/01-expected-init.sql
@@ -21,6 +21,8 @@ SET character_set_server='utf8';
DROP DATABASE IF EXISTS expected_dataset;
CREATE DATABASE expected_dataset;
+CREATE TABLE expected_dataset.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 expected_dataset.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 expected_dataset.t_user (user_id INT PRIMARY KEY, user_name
VARCHAR(50) NOT NULL, password VARCHAR(50) NOT NULL, email VARCHAR(50) NOT
NULL, telephone CHAR(11) NOT NULL, creation_date DATE NOT NULL);
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));
