diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls index f947939846..a1adf5993d 100644 --- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls +++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls @@ -127,6 +127,9 @@ type DriverInfo { # Driver Java class name driverClassName: String defaultPort: String + defaultDatabase: String + defaultServer: String + defaultUser: String sampleURL: String driverInfoURL: String driverPropertiesURL: String diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java index f68ee29e1a..e6978ebfe0 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java @@ -87,6 +87,21 @@ public class WebDatabaseDriverConfig { return driver.getDefaultPort(); } + @Property + public String getDefaultDatabase() { + return driver.getDefaultDatabase(); + } + + @Property + public String getDefaultServer() { + return driver.getDefaultServer(); + } + + @Property + public String getDefaultUser() { + return driver.getDefaultUser(); + } + @Property public String getSampleURL() { return driver.getSampleURL(); diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java index 11bcd83262..6d4f3e4402 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java @@ -556,7 +556,7 @@ class CBSecurityController implements DBWSecurityController { { StringBuilder sql = new StringBuilder("SELECT DA.DATASOURCE_ID,DA.SUBJECT_ID,S.SUBJECT_TYPE FROM CB_DATASOURCE_ACCESS DA,\n" + "CB_AUTH_SUBJECT S\nWHERE S.SUBJECT_ID = DA.SUBJECT_ID AND DA.SUBJECT_ID IN ("); - appendStringParameters(sql, subjectIds); + appendStringParameters(sql, allSubjects.toArray(new String[0])); sql.append(")"); if (allSubjects.isEmpty()) {