DBZ-4867 Do not set database.dbname
for SQL Server
This commit is contained in:
parent
8643ad3a22
commit
c762143178
@ -60,8 +60,8 @@ public static ConnectorConfiguration forJdbcContainer(JdbcDatabaseContainer<?> j
|
|||||||
final String driverClassName = jdbcDatabaseContainer.getDriverClassName();
|
final String driverClassName = jdbcDatabaseContainer.getDriverClassName();
|
||||||
configuration.with(CONNECTOR, ConnectorResolver.getConnectorByJdbcDriver(driverClassName));
|
configuration.with(CONNECTOR, ConnectorResolver.getConnectorByJdbcDriver(driverClassName));
|
||||||
|
|
||||||
// This property is valid for all databases except MySQL
|
// This property is valid for all databases except MySQL and SQL Server
|
||||||
if (!isMySQL(driverClassName)) {
|
if (!isMySQL(driverClassName) && !isSQLServer(driverClassName)) {
|
||||||
configuration.with(DBNAME, jdbcDatabaseContainer.getDatabaseName());
|
configuration.with(DBNAME, jdbcDatabaseContainer.getDatabaseName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,6 +84,10 @@ private static boolean isMySQL(String driverClassName) {
|
|||||||
return "com.mysql.cj.jdbc.Driver".equals(driverClassName) || "com.mysql.jdbc.Driver".equals(driverClassName);
|
return "com.mysql.cj.jdbc.Driver".equals(driverClassName) || "com.mysql.jdbc.Driver".equals(driverClassName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean isSQLServer(String driverClassName) {
|
||||||
|
return "com.microsoft.sqlserver.jdbc.SQLServerDriver".equals(driverClassName);
|
||||||
|
}
|
||||||
|
|
||||||
public ConnectorConfiguration with(String key, String value) {
|
public ConnectorConfiguration with(String key, String value) {
|
||||||
this.configNode.put(key, value);
|
this.configNode.put(key, value);
|
||||||
return this;
|
return this;
|
||||||
|
Loading…
Reference in New Issue
Block a user