You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by lu...@apache.org on 2020/09/03 03:23:09 UTC
[shardingsphere] branch master updated: remove databases name
dependent DCL cases
This is an automated email from the ASF dual-hosted git repository.
lujingshang 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 7b6bb04 remove databases name dependent DCL cases
new 2b0a264 Merge pull request #7230 from tuohai666/dcl1
7b6bb04 is described below
commit 7b6bb04a00ba7166df758e51454df5dc837f7e46
Author: Zhang Yonglun <zh...@apache.org>
AuthorDate: Wed Sep 2 21:53:33 2020 +0800
remove databases name dependent DCL cases
---
.../org/apache/shardingsphere/dbtest/engine/dcl/BaseDCLIT.java | 2 +-
.../dbtest/env/authority/AuthorityEnvironmentManager.java | 3 ++-
.../resources/integrate/cases/dcl/dcl-integrate-test-cases.xml | 8 --------
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dcl/BaseDCLIT.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dcl/BaseDCLIT.java
index 342a974..f8863d2 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dcl/BaseDCLIT.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/dcl/BaseDCLIT.java
@@ -55,7 +55,7 @@ public abstract class BaseDCLIT extends SingleIT {
}
private Map<String, DataSource> createInstanceDataSourceMap() throws SQLException {
- return "masterslave".equals(getRuleType()) || "shadow".equals(getRuleType()) ? getDataSourceMap() : getShardingInstanceDataSourceMap();
+ return "shadow".equals(getRuleType()) ? getDataSourceMap() : getShardingInstanceDataSourceMap();
}
private Map<String, DataSource> getShardingInstanceDataSourceMap() throws SQLException {
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/env/authority/AuthorityEnvironmentManager.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/env/authority/AuthorityEnvironmentManager.java
index e3ffabc..402f342 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/env/authority/AuthorityEnvironmentManager.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/env/authority/AuthorityEnvironmentManager.java
@@ -86,7 +86,8 @@ public final class AuthorityEnvironmentManager {
for (String each : sqls) {
try (Statement statement = connection.createStatement()) {
statement.execute(each);
- } catch (final SQLException ignore) {
+ } catch (final SQLException ex) {
+ log.error("execute '{}' failed.", each, ex);
}
}
}
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dcl/dcl-integrate-test-cases.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dcl/dcl-integrate-test-cases.xml
index 3913af9..d3150be 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dcl/dcl-integrate-test-cases.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dcl/dcl-integrate-test-cases.xml
@@ -56,10 +56,8 @@
<dcl-test-case sql="ALTER ROLE role_dev_bak WITH NAME = role_dev" db-types="SQLServer"/>
<dcl-test-case sql="ALTER ROLE default_role RESET ALL" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER ROLE default_role RESET client_min_messages" db-types="PostgreSQL"/>
- <dcl-test-case sql="ALTER ROLE default_role IN DATABASE db_0 RESET client_min_messages" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER ROLE default_role SET client_min_messages = DEBUG" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER ROLE default_role SET client_min_messages FROM CURRENT" db-types="PostgreSQL"/>
- <dcl-test-case sql="ALTER ROLE default_role IN DATABASE db_0 SET client_min_messages = DEBUG" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER ROLE role_dev NOT IDENTIFIED CONTAINER = ALL" db-types="Oracle"/>
<dcl-test-case sql="ALTER ROLE default_role WITH SUPERUSER" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER ROLE default_role WITH CREATEDB CREATEROLE" db-types="PostgreSQL"/>
@@ -74,11 +72,9 @@
<dcl-test-case sql="ALTER USER user_dev_bak WITH NAME = user_dev" db-types="SQLServer"/>
<dcl-test-case sql="ALTER USER default_user RESET ALL" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER USER default_user RESET client_min_messages" db-types="PostgreSQL"/>
- <dcl-test-case sql="ALTER USER default_user IN DATABASE db_0 RESET client_min_messages" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER USER user_dev REVOKE CONNECT THROUGH user2" db-types="Oracle"/>
<dcl-test-case sql="ALTER USER default_user SET client_min_messages = DEBUG" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER USER default_user SET client_min_messages FROM CURRENT" db-types="PostgreSQL"/>
- <dcl-test-case sql="ALTER USER default_user IN DATABASE db_0 SET client_min_messages = DEBUG" db-types="PostgreSQL"/>
<dcl-test-case sql="ALTER USER user_dev WITH DEFAULT_SCHEMA = schema" db-types="SQLServer"/>
<dcl-test-case sql="ALTER USER user_dev WITH LOGIN = login1" db-types="SQLServer"/>
<dcl-test-case sql="ALTER USER user_dev WITH PASSWORD = 'password'" db-types="SQLServer"/>
@@ -154,14 +150,10 @@
<dcl-test-case sql="REVOKE ALL PRIVILEGES (order_id) ON TABLE t_order FROM role2" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES (order_id) ON TABLE t_order FROM role2, role3" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES ON db_0.t_order FROM user_dev" db-types="Oracle"/>
- <dcl-test-case sql="REVOKE ALL PRIVILEGES ON DATABASE db_0 FROM role2" db-types="PostgreSQL"/>
- <dcl-test-case sql="REVOKE ALL PRIVILEGES ON DATABASE db_0 FROM role2, role3" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES ON SCHEMA public FROM default_role" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES ON SCHEMA public FROM default_role, role2" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES ON TABLE t_order FROM default_role, role2" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE ALL PRIVILEGES FROM user_dev" db-types="Oracle"/>
- <dcl-test-case sql="REVOKE CREATE ON DATABASE db_0 FROM default_role" db-types="PostgreSQL"/>
- <dcl-test-case sql="REVOKE CREATE ON DATABASE db_0, db_1 FROM default_role" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE CREATE ON SCHEMA public FROM default_role" db-types="PostgreSQL"/>
<dcl-test-case sql="REVOKE INSERT, SELECT, UPDATE, DELETE ON *.* FROM user_dev" db-types="MySQL"/>
<dcl-test-case sql="REVOKE INSERT, SELECT, UPDATE, DELETE ON t_order FROM user_dev" db-types="SQLServer"/>