This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 5913fb55122 Refactor AuthorityEnvironment (#36771)
5913fb55122 is described below
commit 5913fb551227f2b012d8c5a8d88cfc19f3d299ce
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Oct 2 09:16:15 2025 +0800
Refactor AuthorityEnvironment (#36771)
* Refactor AuthorityEnvironment
* Refactor AuthorityEnvironment
* Refactor AuthorityEnvironment
---
.../scenario/authority/AuthorityEnvironment.java | 4 ++--
.../type/scenario/authority/AuthoritySQLSet.java | 24 +++++++++----------
.../env/scenario/cluster_jdbc_proxy/authority.xml | 28 +++++++++++-----------
.../test/resources/env/scenario/db/authority.xml | 28 +++++++++++-----------
.../scenario/db_tbl_sql_federation/authority.xml | 16 ++++++-------
.../dbtbl_with_readwrite_splitting/authority.xml | 28 +++++++++++-----------
.../authority.xml | 28 +++++++++++-----------
.../env/scenario/distsql_rdl/authority.xml | 28 +++++++++++-----------
.../env/scenario/empty_rules/authority.xml | 28 +++++++++++-----------
.../resources/env/scenario/encrypt/authority.xml | 28 +++++++++++-----------
.../encrypt_and_readwrite_splitting/authority.xml | 28 +++++++++++-----------
.../env/scenario/encrypt_shadow/authority.xml | 28 +++++++++++-----------
.../test/resources/env/scenario/mask/authority.xml | 28 +++++++++++-----------
.../env/scenario/mask_encrypt/authority.xml | 28 +++++++++++-----------
.../scenario/mask_encrypt_sharding/authority.xml | 28 +++++++++++-----------
.../env/scenario/mask_sharding/authority.xml | 28 +++++++++++-----------
.../env/scenario/readwrite_splitting/authority.xml | 28 +++++++++++-----------
.../readwrite_splitting_and_shadow/authority.xml | 28 +++++++++++-----------
.../resources/env/scenario/shadow/authority.xml | 28 +++++++++++-----------
.../scenario/sharding_and_encrypt/authority.xml | 28 +++++++++++-----------
.../env/scenario/sharding_and_shadow/authority.xml | 28 +++++++++++-----------
.../scenario/sharding_encrypt_shadow/authority.xml | 28 +++++++++++-----------
.../test/resources/env/scenario/tbl/authority.xml | 28 +++++++++++-----------
23 files changed, 302 insertions(+), 302 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
index 06bc56202b0..b7e838049d1 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthorityEnvironment.java
@@ -41,7 +41,7 @@ public final class AuthorityEnvironment {
* @return init SQLs
*/
public Collection<String> getInitSQLs(final DatabaseType databaseType) {
- return sqlSets.stream().flatMap(each ->
each.getCreateUserSQLs(databaseType).stream()).collect(Collectors.toList());
+ return sqlSets.stream().flatMap(each ->
each.getInitSQLs(databaseType).stream()).collect(Collectors.toList());
}
/**
@@ -51,6 +51,6 @@ public final class AuthorityEnvironment {
* @return clean SQLs
*/
public Collection<String> getCleanSQLs(final DatabaseType databaseType) {
- return sqlSets.stream().flatMap(each ->
each.getDropUserSQLs(databaseType).stream()).collect(Collectors.toList());
+ return sqlSets.stream().flatMap(each ->
each.getCleanSQLs(databaseType).stream()).collect(Collectors.toList());
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
index 23efb28a127..d60720cb651 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/scenario/authority/AuthoritySQLSet.java
@@ -43,32 +43,32 @@ public final class AuthoritySQLSet {
@XmlAttribute(name = "db-types", required = true)
private String databaseTypes;
- @XmlElementWrapper(name = "user-create")
+ @XmlElementWrapper(name = "init")
@XmlElement(name = "sql")
- private List<String> useCreateSQLs = new LinkedList<>();
+ private List<String> initSQLs = new LinkedList<>();
- @XmlElementWrapper(name = "user-drop")
+ @XmlElementWrapper(name = "clean")
@XmlElement(name = "sql")
- private List<String> useDropSQLs = new LinkedList<>();
+ private List<String> cleanSQLs = new LinkedList<>();
/**
- * Get all create user SQLs.
+ * Get all init SQLs.
*
* @param databaseType database type
- * @return create user SQLs
+ * @return init SQLs
*/
- public Collection<String> getCreateUserSQLs(final DatabaseType
databaseType) {
- return getDatabaseTypes().contains(databaseType) ? useCreateSQLs :
Collections.emptyList();
+ public Collection<String> getInitSQLs(final DatabaseType databaseType) {
+ return getDatabaseTypes().contains(databaseType) ? initSQLs :
Collections.emptyList();
}
/**
- * Get all drop user SQLs.
+ * Get all clean SQLs.
*
* @param databaseType database type
- * @return create user SQLs
+ * @return clean SQLs
*/
- public Collection<String> getDropUserSQLs(final DatabaseType databaseType)
{
- return getDatabaseTypes().contains(databaseType) ? useDropSQLs :
Collections.emptyList();
+ public Collection<String> getCleanSQLs(final DatabaseType databaseType) {
+ return getDatabaseTypes().contains(databaseType) ? cleanSQLs :
Collections.emptyList();
}
private Collection<DatabaseType> getDatabaseTypes() {
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/scenario/cluster_jdbc_proxy/authority.xml
b/test/e2e/operation/showprocesslist/src/test/resources/env/scenario/cluster_jdbc_proxy/authority.xml
index 78a86719405..87ec6f4d3a0 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/scenario/cluster_jdbc_proxy/authority.xml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/scenario/cluster_jdbc_proxy/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,24 +34,24 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -59,11 +59,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/db/authority.xml
index 5b5e1f91020..2beac0f35f0 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/db/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/db/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db_0.* to
user_dev@localhost</sql>
@@ -60,8 +60,8 @@
<sql>GRANT select,update,insert,delete on db_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -69,11 +69,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/authority.xml
index 1e3ca9b0a6e..1cf7abf35f6 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,10 +34,10 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on sql_federation_ds_0.* to
user_dev@localhost</sql>
@@ -50,8 +50,8 @@
<sql>GRANT select,update,insert,delete on sql_federation_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on sql_federation_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on sql_federation_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -59,6 +59,6 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/authority.xml
index 4319bea481d..74360ad225f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on write_ds_0.* to
user_dev@localhost</sql>
@@ -70,8 +70,8 @@
<sql>GRANT select,update,insert,delete on read_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on read_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on read_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -79,11 +79,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/authority.xml
index 181a680f7db..ee73a08fe39 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_write_ds_0.* to
user_dev@localhost</sql>
@@ -70,8 +70,8 @@
<sql>GRANT select,update,insert,delete on encrypt_read_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_read_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_read_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -79,11 +79,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
index 131d122d2ac..1a573aa8d5a 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,27 +34,27 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on rdl_ds_0.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on rdl_ds_1.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on rdl_ds_2.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -62,11 +62,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/authority.xml
index 4319bea481d..74360ad225f 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on write_ds_0.* to
user_dev@localhost</sql>
@@ -70,8 +70,8 @@
<sql>GRANT select,update,insert,delete on read_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on read_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on read_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -79,11 +79,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/encrypt/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt/authority.xml
index 6b746be38bd..12f2e3ac1b7 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,25 +34,25 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -60,11 +60,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/authority.xml
index 6c62daa7948..8743654389a 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,26 +34,26 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_write_ds.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_read_ds.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -61,11 +61,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/authority.xml
index 192441cecaf..b4f7e72cd9a 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/encrypt_shadow/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,26 +34,26 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_shadow_db.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -61,11 +61,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/mask/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/mask/authority.xml
index 6b746be38bd..12f2e3ac1b7 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,25 +34,25 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -60,11 +60,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/authority.xml
index 77538802a58..e4ee20bb229 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_0.* to
user_dev@localhost</sql>
@@ -60,8 +60,8 @@
<sql>GRANT select,update,insert,delete on encrypt_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -69,11 +69,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/authority.xml
index 1d4fecab638..055f76047a1 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/mask_encrypt_sharding/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_encrypt_ds_0.* to
user_dev@localhost</sql>
@@ -60,8 +60,8 @@
<sql>GRANT select,update,insert,delete on mask_encrypt_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_encrypt_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_encrypt_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -69,11 +69,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/authority.xml
index 5e830272fc0..ac4665ee55f 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/mask_sharding/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_ds_0.* to
user_dev@localhost</sql>
@@ -60,8 +60,8 @@
<sql>GRANT select,update,insert,delete on mask_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on mask_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -69,11 +69,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/authority.xml
index 43b3548a64f..0067acb9891 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,25 +34,25 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on write_ds.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -60,11 +60,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/authority.xml
index 7714c14e972..a0f0dd62960 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/readwrite_splitting_and_shadow/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,26 +34,26 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on write_db.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on write_db_shadow.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -61,11 +61,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/shadow/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/shadow/authority.xml
index d7712c0396c..59be715012b 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/shadow/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/shadow/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,26 +34,26 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on db.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on shadow_db.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -61,11 +61,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/authority.xml
index 77538802a58..e4ee20bb229 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,20 +34,20 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_0.* to
user_dev@localhost</sql>
@@ -60,8 +60,8 @@
<sql>GRANT select,update,insert,delete on encrypt_ds_7.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_8.* to
user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on encrypt_ds_9.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -69,11 +69,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/authority.xml
index 5267478c402..ce155328078 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_shadow/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,24 +34,24 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -59,11 +59,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/authority.xml
index 5267478c402..ce155328078 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/authority.xml
+++
b/test/e2e/sql/src/test/resources/env/scenario/sharding_encrypt_shadow/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,24 +34,24 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -59,11 +59,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/authority.xml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/authority.xml
index c118d872e3b..44c4a7ae26b 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/authority.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/authority.xml
@@ -17,14 +17,14 @@
<authority>
<sqlset db-types="Oracle,SQLServer,PostgreSQL,openGauss">
- <user-create>
+ <init>
<sql>CREATE USER default_user</sql>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE ROLE role2</sql>
<sql>CREATE ROLE role3</sql>
<sql>CREATE ROLE role4</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP ROLE IF EXISTS default_role</sql>
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
@@ -34,25 +34,25 @@
<sql>DROP USER IF EXISTS user_dev</sql>
<sql>DROP USER IF EXISTS user_dev_new</sql>
<sql>DROP USER IF EXISTS default_user</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="SQLServer">
- <user-create>
+ <init>
<sql>CREATE LOGIN login_dev</sql>
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP LOGIN IF EXISTS login_dev</sql>
<sql>DROP LOGIN IF EXISTS login_dev_new</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="MySQL">
- <user-create>
+ <init>
<sql>CREATE ROLE default_role</sql>
<sql>CREATE USER user_dev@localhost</sql>
<sql>GRANT select,update,insert,delete on tbl.* to
user_dev@localhost</sql>
- </user-create>
- <user-drop>
+ </init>
+ <clean>
<sql>DROP USER IF EXISTS user_dev@localhost</sql>
<sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
<sql>DROP USER IF EXISTS [email protected]</sql>
@@ -60,11 +60,11 @@
<sql>DROP ROLE IF EXISTS role_dev</sql>
<sql>DROP ROLE IF EXISTS role_dev_new</sql>
<sql>FLUSH PRIVILEGES</sql>
- </user-drop>
+ </clean>
</sqlset>
<sqlset db-types="Oracle">
- <user-create>
+ <init>
<sql>CREATE USER user_dev identified by passwd_dev</sql>
- </user-create>
+ </init>
</sqlset>
</authority>
