Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimize the message of DatabaseServerInfo #28428

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Optimize the message of DatabaseServerInfo #28428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
515a9a8
Optimize the message of `DatabaseServerInfo`
134130 Sep 13, 2023
f84bef3
Fix message from DBMS to Database type
134130 Sep 13, 2023
d8941c5
Fix databaseName to databaseType
134130 Sep 13, 2023
3a19465
Merge remote-tracking branch 'apache/master' into fix/#28421
134130 Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../bootstrap/src/main/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}
}
2 changes: 1 addition & 1 deletion ...tstrap/src/test/java/org/apache/shardingsphere/proxy/database/DatabaseServerInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`"));
}
}