From abb2355c87f399ad618a925e80f1faa2bfc5562c Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Fri, 22 Apr 2022 11:12:19 +0300 Subject: [PATCH] CB-1949 add requiresServerName to the gql schema (#780) * CB-1949 add requiresServerName to the gql schema * CB-1949 add requiresServerName to the gql schema --- .../io.cloudbeaver.server/schema/service.core.graphqls | 1 + .../io/cloudbeaver/model/WebDatabaseDriverConfig.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls index 793b3a5a76..5f0f683899 100644 --- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls +++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls @@ -194,6 +194,7 @@ type DriverInfo { driverPropertiesURL: String embedded: Boolean enabled: Boolean! + requiresServerName: Boolean # this fields must be removed and be replaced by DriverAuthModel allowsEmptyPassword: Boolean @deprecated 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 dcc8a4460e..263f44cb22 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 @@ -42,6 +42,7 @@ import java.util.Map; */ public class WebDatabaseDriverConfig { + public static final String URL_SERVER_FIELD = "{server}"; private final WebSession webSession; private final DBPDriver driver; private String id; @@ -239,4 +240,12 @@ public class WebDatabaseDriverConfig { public boolean isEnabled() { return ConfigurationUtils.isDriverEnabled(driver); } + + @Property + public boolean getRequiresServerName() { + if (driver.getSampleURL() == null) { + return false; + } + return driver.getSampleURL().contains(URL_SERVER_FIELD); + } }