#13654 JDBC URL template usage redesign. Use it always when it is defined and enabled by driver

This commit is contained in:
Serge Rider
2021-11-17 19:15:11 +03:00
parent 3a7aa1f9b5
commit 1f57522ec0
2 changed files with 2 additions and 2 deletions
@@ -169,7 +169,7 @@ public class WebServiceUtils {
if (config.getServerName() != null) {
dsConfig.setServerName(config.getServerName());
}
dsConfig.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, dsConfig));
dsConfig.setUrl(driver.getConnectionURL(dsConfig));
}
if (config.getProperties() != null) {
Map<String, String> newProps = new LinkedHashMap<>();
@@ -171,7 +171,7 @@ public class WebDatabaseDriverConfig {
cfg.setUrl(driver.getSampleURL());
cfg.setHostName("localhost");
cfg.setHostPort(driver.getDefaultPort());
cfg.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, cfg));
cfg.setUrl(driver.getConnectionURL(cfg));
DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
if (properties == null) {
return new WebPropertyInfo[0];