Optimize the message of DatabaseServerInfo (#28428)

* Optimize the message of `DatabaseServerInfo` * Fix message from DBMS to Database type * Fix databaseName to databaseType
apache · Sep 15, 2023 · 871cedb · 871cedb
1 parent c865d03
commit 871cedb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java b/.../bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
@@ -31,14 +31,14 @@
 @Getter
 public final class DatabaseServerInfo {
 
-    private final String databaseName;
+    private final String databaseType;
 
     private final String databaseVersion;
 
     public DatabaseServerInfo(final DataSource dataSource) {
         try (Connection connection = dataSource.getConnection()) {
             DatabaseMetaData databaseMetaData = connection.getMetaData();
-            databaseName = databaseMetaData.getDatabaseProductName();
+            databaseType = databaseMetaData.getDatabaseProductName();
             databaseVersion = databaseMetaData.getDatabaseProductVersion();
         } catch (final SQLException ex) {
             throw new DatabaseServerLoadingServerException(ex);
@@ -47,6 +47,6 @@ public DatabaseServerInfo(final DataSource dataSource) {
 
     @Override
     public String toString() {
-        return String.format("Database name is `%s`, version is `%s`", databaseName, databaseVersion);
+        return String.format("Database type is `%s`, version is `%s`", databaseType, databaseVersion);
     }
 }
diff --git a/...tstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java b/...tstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
@@ -52,6 +52,6 @@ void assertToString() throws SQLException {
         when(databaseMetaData.getDatabaseProductName()).thenReturn("fixtureDB");
         when(databaseMetaData.getDatabaseProductVersion()).thenReturn("1.0.0");
         when(dataSource.getConnection().getMetaData()).thenReturn(databaseMetaData);
-        assertThat(new DatabaseServerInfo(dataSource).toString(), is("Database name is `fixtureDB`, version is `1.0.0`"));
+        assertThat(new DatabaseServerInfo(dataSource).toString(), is("Database type is `fixtureDB`, version is `1.0.0`"));
     }
 }