This is an automated email from the ASF dual-hosted git repository.
kimmking 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 1306bf6 #6872, DROP ROLE/USER throws Exception for all database types
(#7215)
1306bf6 is described below
commit 1306bf6183c83d879bb063d19ccacf0912560310
Author: Zhang Yonglun <zhangyong...@apache.org>
AuthorDate: Wed Sep 2 13:21:43 2020 +0800
#6872, DROP ROLE/USER throws Exception for all database types (#7215)
---
.../test/resources/integrate/env/db/authority.xml | 24 +++++++++++-----------
.../env/dbtbl_with_masterslave/authority.xml | 24 +++++++++++-----------
.../integrate/env/masterslave/authority.xml | 24 +++++++++++-----------
.../resources/integrate/env/shadow/authority.xml | 24 +++++++++++-----------
.../test/resources/integrate/env/tbl/authority.xml | 24 +++++++++++-----------
5 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/authority.xml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/authority.xml
index 76b9778..88249f1 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/authority.xml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/db/authority.xml
@@ -21,10 +21,10 @@
<sql>CREATE ROLE role_dev</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev</sql>
- <sql>DROP USER user_dev_new</sql>
+ <sql>DROP ROLE IF EXISTS role_dev</sql>
+ <sql>DROP ROLE IF EXISTS role_dev_new</sql>
+ <sql>DROP USER IF EXISTS user_dev</sql>
+ <sql>DROP USER IF EXISTS user_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="SQLServer">
@@ -33,8 +33,8 @@
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
</user-create>
<user-drop>
- <sql>DROP LOGIN login_dev</sql>
- <sql>DROP LOGIN login_dev_new</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="MySQL">
@@ -63,12 +63,12 @@
<sql>GRANT select,update,insert,delete on db_9.t_order to
user_dev@localhost</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE default_role</sql>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev@localhost</sql>
- <sql>DROP USER user_dev_new@localhost</sql>
- <sql>DROP USER user_dev@127.0.0.1</sql>
+ <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>
+ <sql>DROP USER IF EXISTS user_dev@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev@127.0.0.1</sql>
<sql>FLUSH PRIVILEGES</sql>
</user-drop>
</sqlset>
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml
index bc76661..3bbb1f3 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/dbtbl_with_masterslave/authority.xml
@@ -21,10 +21,10 @@
<sql>CREATE ROLE role_dev</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev</sql>
- <sql>DROP USER user_dev_new</sql>
+ <sql>DROP ROLE IF EXISTS role_dev</sql>
+ <sql>DROP ROLE IF EXISTS role_dev_new</sql>
+ <sql>DROP USER IF EXISTS user_dev</sql>
+ <sql>DROP USER IF EXISTS user_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="SQLServer">
@@ -33,8 +33,8 @@
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
</user-create>
<user-drop>
- <sql>DROP LOGIN login_dev</sql>
- <sql>DROP LOGIN login_dev_new</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="MySQL">
@@ -153,12 +153,12 @@
<sql>GRANT select,update,insert,delete on master_db_9.t_order_9 to
user_dev@localhost</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE default_role</sql>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev@localhost</sql>
- <sql>DROP USER user_dev_new@localhost</sql>
- <sql>DROP USER user_dev@127.0.0.1</sql>
+ <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>
+ <sql>DROP USER IF EXISTS user_dev@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev@127.0.0.1</sql>
<sql>FLUSH PRIVILEGES</sql>
</user-drop>
</sqlset>
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml
index 9c2f0f1..763ace9 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/masterslave/authority.xml
@@ -21,10 +21,10 @@
<sql>CREATE ROLE role_dev</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev</sql>
- <sql>DROP USER user_dev_new</sql>
+ <sql>DROP ROLE IF EXISTS role_dev</sql>
+ <sql>DROP ROLE IF EXISTS role_dev_new</sql>
+ <sql>DROP USER IF EXISTS user_dev</sql>
+ <sql>DROP USER IF EXISTS user_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="SQLServer">
@@ -33,8 +33,8 @@
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
</user-create>
<user-drop>
- <sql>DROP LOGIN login_dev</sql>
- <sql>DROP LOGIN login_dev_new</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="MySQL">
@@ -45,12 +45,12 @@
<sql>GRANT select,update,insert,delete on master.t_order to
user_dev@localhost</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE default_role</sql>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev@localhost</sql>
- <sql>DROP USER user_dev_new@localhost</sql>
- <sql>DROP USER user_dev@127.0.0.1</sql>
+ <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>
+ <sql>DROP USER IF EXISTS user_dev@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev@127.0.0.1</sql>
<sql>FLUSH PRIVILEGES</sql>
</user-drop>
</sqlset>
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/shadow/authority.xml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/shadow/authority.xml
index 9c2f0f1..763ace9 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/shadow/authority.xml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/shadow/authority.xml
@@ -21,10 +21,10 @@
<sql>CREATE ROLE role_dev</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev</sql>
- <sql>DROP USER user_dev_new</sql>
+ <sql>DROP ROLE IF EXISTS role_dev</sql>
+ <sql>DROP ROLE IF EXISTS role_dev_new</sql>
+ <sql>DROP USER IF EXISTS user_dev</sql>
+ <sql>DROP USER IF EXISTS user_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="SQLServer">
@@ -33,8 +33,8 @@
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
</user-create>
<user-drop>
- <sql>DROP LOGIN login_dev</sql>
- <sql>DROP LOGIN login_dev_new</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="MySQL">
@@ -45,12 +45,12 @@
<sql>GRANT select,update,insert,delete on master.t_order to
user_dev@localhost</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE default_role</sql>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev@localhost</sql>
- <sql>DROP USER user_dev_new@localhost</sql>
- <sql>DROP USER user_dev@127.0.0.1</sql>
+ <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>
+ <sql>DROP USER IF EXISTS user_dev@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev@127.0.0.1</sql>
<sql>FLUSH PRIVILEGES</sql>
</user-drop>
</sqlset>
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/authority.xml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/authority.xml
index c87d22f..3630e33 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/authority.xml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/env/tbl/authority.xml
@@ -21,10 +21,10 @@
<sql>CREATE ROLE role_dev</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev</sql>
- <sql>DROP USER user_dev_new</sql>
+ <sql>DROP ROLE IF EXISTS role_dev</sql>
+ <sql>DROP ROLE IF EXISTS role_dev_new</sql>
+ <sql>DROP USER IF EXISTS user_dev</sql>
+ <sql>DROP USER IF EXISTS user_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="SQLServer">
@@ -33,8 +33,8 @@
<sql>CREATE USER user_dev FOR LOGIN login_dev</sql>
</user-create>
<user-drop>
- <sql>DROP LOGIN login_dev</sql>
- <sql>DROP LOGIN login_dev_new</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev</sql>
+ <sql>DROP LOGIN IF EXISTS login_dev_new</sql>
</user-drop>
</sqlset>
<sqlset db-types="MySQL">
@@ -54,12 +54,12 @@
<sql>GRANT select,update,insert,delete on t_order_9 to
user_dev@localhost</sql>
</user-create>
<user-drop>
- <sql>DROP ROLE default_role</sql>
- <sql>DROP ROLE role_dev</sql>
- <sql>DROP ROLE role_dev_new</sql>
- <sql>DROP USER user_dev@localhost</sql>
- <sql>DROP USER user_dev_new@localhost</sql>
- <sql>DROP USER user_dev@127.0.0.1</sql>
+ <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>
+ <sql>DROP USER IF EXISTS user_dev@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev_new@localhost</sql>
+ <sql>DROP USER IF EXISTS user_dev@127.0.0.1</sql>
<sql>FLUSH PRIVILEGES</sql>
</user-drop>
</sqlset>
