From 12de6bf3631a4a1053120312ef09550c1ce9a7af Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 13 Aug 2020 17:05:41 +0300
Subject: [PATCH 1/2] dbeaver/dbeaver#9520 Driver config change

---
 .../schema/service.core.graphqls                  |  3 +++
 .../model/WebDatabaseDriverConfig.java            | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

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();

From 72f7f5b92b1681fa83e01b96bc7fd965cdd6fe5e Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 14 Aug 2020 14:51:07 +0300
Subject: [PATCH 2/2] CB-233 Subject grants read fix

---
 .../src/io/cloudbeaver/server/CBSecurityController.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()) {