#16696 save connection settings even if reconnect refused (#16699)

dbeaver · Jun 3, 2022 · dc371f4 · dc371f4
1 parent d45e272
commit dc371f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 30 deletions.
diff --git a/...jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java b/...jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionPageGeneral.java
@@ -129,15 +129,6 @@ private FilterInfo(Class<?> type, String title) {
         }
     }
 
-    @Nullable
-    protected Boolean isConnectionReadOnly() {
-        return this.readOnlyConnection == null? null : this.readOnlyConnection.getSelection();
-    }
-
-    @Nullable
-    protected List<DBPDataSourcePermission> getAccessRestrictions() {
-        return this.accessRestrictions;
-    }
 
     protected boolean wasActivated() {
         return this.activated;
@@ -602,9 +593,8 @@ public void saveSettings(DBPDataSourceContainer dataSource) {
         }
         dsDescriptor.setNavigatorSettings(this.navigatorSettings);
 
-        // it should be changed with connection settings and saved only on reconnect when connection is active
-        // dsDescriptor.setConnectionReadOnly(this.readOnlyConnection.getSelection());
-        // dsDescriptor.setModifyPermissions(this.accessRestrictions);
+        dsDescriptor.setConnectionReadOnly(this.readOnlyConnection.getSelection());
+        dsDescriptor.setModifyPermissions(this.accessRestrictions);
 
         for (FilterInfo filterInfo : filters) {
             if (filterInfo.filter != null) {

diff --git a/.../org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java b/.../org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
@@ -106,7 +106,7 @@ public void dispose() {
 
     public abstract ConnectionPageSettings getPageSettings();
 
-    protected abstract void saveSettings(DataSourceDescriptor dataSource, boolean isSaveConnectionSettings);
+    protected abstract void saveSettings(DataSourceDescriptor dataSource);
 
     @NotNull
     public DataSourceDescriptor getActiveDataSource() {
@@ -142,7 +142,7 @@ public void testConnection() {
         DataSourceDescriptor dataSource = getPageSettings().getActiveDataSource();
         DataSourceDescriptor testDataSource = new DataSourceDescriptor(dataSource, dataSource.getRegistry());
 
-        saveSettings(testDataSource, true);
+        saveSettings(testDataSource);
         testDataSource.setTemporary(true);
 
         // Generate new ID to avoid session conflicts in QM

diff --git a/....jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java b/....jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java
@@ -209,7 +209,7 @@ public IWizardPage getPage(String name) {
     public boolean performFinish() {
         DataSourceDescriptor dsCopy = new DataSourceDescriptor(originalDataSource, originalDataSource.getRegistry());
         DataSourceDescriptor dsChanged = new DataSourceDescriptor(dataSource, dataSource.getRegistry());
-        saveSettings(dsChanged, true);
+        saveSettings(dsChanged);
 
         if (dsCopy.equalSettings(dsChanged)) {
             // No changes
@@ -241,7 +241,7 @@ public boolean performFinish() {
         }
 
         // Save
-        saveSettings(originalDataSource, saveConnectionSettings);
+        saveSettings(originalDataSource);
         originalDataSource.getRegistry().updateDataSource(originalDataSource);
 
 
@@ -290,19 +290,9 @@ public void init(IWorkbench workbench, IStructuredSelection selection) {
     }
 
     @Override
-    protected void saveSettings(DataSourceDescriptor dataSource, boolean isSaveConnectionSettings) {
-        if (isPageActive(pageSettings) && isSaveConnectionSettings) {
+    protected void saveSettings(DataSourceDescriptor dataSource) {
+        if (isPageActive(pageSettings)) {
             pageSettings.saveSettings(dataSource);
-            if (pageGeneral.wasActivated()) {
-                Boolean isReadOnlyConnection = pageGeneral.isConnectionReadOnly();
-                if (isReadOnlyConnection != null) {
-                    dataSource.setConnectionReadOnly(isReadOnlyConnection);
-                }
-                List<DBPDataSourcePermission> accessRestrictions = pageGeneral.getAccessRestrictions();
-                if (accessRestrictions != null) {
-                    dataSource.setModifyPermissions(accessRestrictions);
-                }
-            }
         }
         pageGeneral.saveSettings(dataSource);
         pageInit.saveSettings(dataSource);

diff --git a/...g.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java b/...g.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/NewConnectionWizard.java
@@ -205,7 +205,7 @@ public boolean performFinish()
         DataSourceDescriptor dataSourceNew = new DataSourceDescriptor(
             dataSourceRegistry, dataSourceTpl.getId(), driver, dataSourceTpl.getConnectionConfiguration());
         dataSourceNew.copyFrom(dataSourceTpl);
-        saveSettings(dataSourceNew, true);
+        saveSettings(dataSourceNew);
         dataSourceRegistry.addDataSource(dataSourceNew);
         return true;
     }
@@ -217,7 +217,7 @@ public void init(IWorkbench workbench, IStructuredSelection selection)
     }
 
     @Override
-    protected void saveSettings(DataSourceDescriptor dataSource, boolean isSaveConnectionSettings) {
+    protected void saveSettings(DataSourceDescriptor dataSource) {
         ConnectionPageSettings pageSettings = getPageSettings(dataSource.getDriver());
         if (pageSettings != null) {
             pageSettings.saveSettings(dataSource);