From 57130ffe7c970b4f94bffde071517b6b3eaaafd7 Mon Sep 17 00:00:00 2001 From: yagudin10 Date: Fri, 5 Aug 2022 18:35:12 +0300 Subject: [PATCH] CB-2366 rename extended conf type to manual --- .../src/io/cloudbeaver/model/WebConnectionInfo.java | 2 +- .../bundles/io.cloudbeaver.server/schema/service.core.graphqls | 2 +- .../src/io/cloudbeaver/model/WebDatabaseDriverConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java index f28de226ea..82e5ca35c2 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java @@ -258,7 +258,7 @@ public class WebConnectionInfo { public DBPDriverConfigurationType getConfigurationType() { DBPDriverConfigurationType configurationType = dataSourceContainer.getConnectionConfiguration().getConfigurationType(); if (configurationType == null) { - configurationType = DBPDriverConfigurationType.EXTENDED; + configurationType = DBPDriverConfigurationType.MANUAL; } return configurationType; } diff --git a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls index 09683890bc..1f3b41d663 100644 --- a/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls +++ b/server/bundles/io.cloudbeaver.server/schema/service.core.graphqls @@ -238,7 +238,7 @@ enum ResultDataFormat { } enum DriverConfigurationType { - EXTENDED, + MANUAL, URL } 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 4034394a4f..fb0f5350ef 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 @@ -247,6 +247,6 @@ public class WebDatabaseDriverConfig { @Property public DBPDriverConfigurationType[] getConfigurationTypes() { - return driver.supportedConfigurationTypes().toArray(DBPDriverConfigurationType[]::new); + return driver.getSupportedConfigurationTypes().toArray(DBPDriverConfigurationType[]::new); } }