CB-59 Drivers in CB EE

This commit is contained in:
serge-rider
2020-05-20 23:16:39 +03:00
parent df3d27a8bf
commit b39a6bf13d
2 changed files with 5 additions and 2 deletions
@@ -152,6 +152,9 @@ public class WebDatabaseDriverConfig {
cfg.setHostPort(driver.getDefaultPort());
cfg.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, cfg));
DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
if (properties == null) {
return new WebPropertyInfo[0];
}
PropertySourceCustom propertySource = new PropertySourceCustom(
properties,
@@ -155,7 +155,7 @@ public class CBPlatform extends BasePlatformImpl {
continue;
}
List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
if (!libraries.isEmpty()) {
{
boolean hasAllFiles = true;
for (DBPDriverLibrary lib : libraries) {
if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&
@@ -172,7 +172,7 @@ public class CBPlatform extends BasePlatformImpl {
}
}
}
log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getId).collect(Collectors.joining(",")));
log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getFullName).collect(Collectors.joining(",")));
sessionManager = WebSessionManager.getInstance();