This is an automated email from the ASF dual-hosted git repository.
panjuan 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 1e7e681c6f4 Fix label of ShowDatabasesExecutor (#29759)
1e7e681c6f4 is described below
commit 1e7e681c6f49517724a8e88b7e4b7e580177cc10
Author: Raigor <[email protected]>
AuthorDate: Thu Jan 18 12:11:01 2024 +0800
Fix label of ShowDatabasesExecutor (#29759)
---
.../mysql/handler/admin/executor/ShowDatabasesExecutor.java | 2 +-
.../mysql/handler/admin/executor/ShowDatabasesExecutorTest.java | 7 ++++++-
.../test/resources/cases/dal/dataset/db/mysql/show_databases.xml | 2 +-
.../dbtbl_with_readwrite_splitting/mysql/show_databases.xml | 2 +-
.../mysql/show_databases.xml | 2 +-
.../resources/cases/dal/dataset/encrypt/mysql/show_databases.xml | 2 +-
.../encrypt_and_readwrite_splitting/mysql/show_databases.xml | 2 +-
.../cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml | 2 +-
.../dal/dataset/sharding_and_encrypt/mysql/show_databases.xml | 2 +-
.../test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml | 2 +-
10 files changed, 15 insertions(+), 10 deletions(-)
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
index 951d0024fae..c95d4b70ca8 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutor.java
@@ -72,6 +72,6 @@ public final class ShowDatabasesExecutor implements
DatabaseAdminQueryExecutor {
@Override
public QueryResultMetaData getQueryResultMetaData() {
- return new RawQueryResultMetaData(Collections.singletonList(new
RawQueryResultColumnMetaData("SCHEMATA", "Database", "schema_name",
Types.VARCHAR, "VARCHAR", 255, 0)));
+ return new RawQueryResultMetaData(Collections.singletonList(new
RawQueryResultColumnMetaData("SCHEMATA", "SCHEMA_NAME", "Database",
Types.VARCHAR, "VARCHAR", 255, 0)));
}
}
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
index 5b9e3b0298d..4d1cceba860 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowDatabasesExecutorTest.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.authority.model.ShardingSpherePrivileges;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResultMetaData;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
@@ -76,7 +77,11 @@ class ShowDatabasesExecutorTest {
when(ProxyContext.getInstance().getAllDatabaseNames()).thenReturn(IntStream.range(0,
10).mapToObj(each -> String.format("database_%s",
each)).collect(Collectors.toList()));
ShowDatabasesExecutor executor = new ShowDatabasesExecutor(new
MySQLShowDatabasesStatement());
executor.execute(mockConnectionSession());
- assertThat(executor.getQueryResultMetaData().getColumnCount(), is(1));
+ QueryResultMetaData queryResultMetaData =
executor.getQueryResultMetaData();
+ assertThat(queryResultMetaData.getColumnCount(), is(1));
+ assertThat(queryResultMetaData.getTableName(1), is("SCHEMATA"));
+ assertThat(queryResultMetaData.getColumnLabel(1), is("Database"));
+ assertThat(queryResultMetaData.getColumnName(1), is("SCHEMA_NAME"));
assertThat(getActual(executor), is(getExpected()));
}
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
index 44f9413a53e..59d4d23c49b 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/db/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="db" />
<row values="information_schema" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
index 821fd87151b..23713402b92 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="dbtbl_with_readwrite_splitting" />
<row values="information_schema" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
index c7c6cf53d38..4bc6ed22f0e 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="dbtbl_with_readwrite_splitting_and_encrypt" />
<row values="information_schema" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
index 6851b0f80be..39e9d331b21 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="encrypt" />
<row values="information_schema" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
index d3f11bab3db..e6be4dea1c3 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/encrypt_and_readwrite_splitting/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="encrypt_and_readwrite_splitting" />
<row values="information_schema" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
index 6d75c8017fa..943b8d2c2b1 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/readwrite_splitting/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="information_schema" />
<row values="mysql" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
index 48dcbb36fc6..cdb23b451a2 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/sharding_and_encrypt/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="information_schema" />
<row values="mysql" />
diff --git
a/test/e2e/sql/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
b/test/e2e/sql/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
index 42f436c4cf2..f0eaab9b8fc 100644
---
a/test/e2e/sql/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
+++
b/test/e2e/sql/src/test/resources/cases/dal/dataset/tbl/mysql/show_databases.xml
@@ -17,7 +17,7 @@
<dataset>
<metadata>
- <column name="schema_name" />
+ <column name="database" />
</metadata>
<row values="information_schema" />
<row values="mysql" />
