From b93ec1d106b902a3ddb862600874d523a94715de Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 11 Sep 2019 12:43:35 +0300
Subject: [PATCH] connection copy-paste fix (folder + different projects)

Former-commit-id: adbd8512efa6bbba9a83470d60789e094969f0dc
---
 .../dbeaver/registry/DataSourceDescriptorManager.java      | 3 ++-
 .../jkiss/dbeaver/model/navigator/DBNProjectDatabases.java | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
index ab15a54574..faf0fe4f4a 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
@@ -91,7 +91,8 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
             dataSource.copyFrom(dsTpl);
             if (folder != null) {
                 dataSource.setFolder(folder);
-            } else {
+            } else if (dsTpl.getRegistry() == registry) {
+                // Copy folder only if we copy in the same project
                 dataSource.setFolder(dsTpl.getFolder());
             }
             // Generate new name
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
index 1a02b6edef..7479133cc5 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNProjectDatabases.java
@@ -243,6 +243,13 @@ public class DBNProjectDatabases extends DBNNode implements DBNContainer, DBPEve
     {
         DBNDataSource newNode = new DBNDataSource(this, descriptor);
         dataSources.add(newNode);
+
+        DBPDataSourceFolder dsFolder = descriptor.getFolder();
+        if (dsFolder != null) {
+            // Add folder node to cache
+            getFolderNode(dsFolder);
+        }
+
         children = null;
         if (reflect) {
             getModel().fireNodeEvent(new DBNEvent(
-- 
GitLab