From 2c3cac8c1f9400fdb34daf4fa1293856fecb07be Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Wed, 19 Dec 2012 10:37:23 +0000
Subject: [PATCH] SQLEditor input fixed (do not cache ds container as it is not
 refreshed on ds change)

Former-commit-id: 3450ef71ee709e7a7ff1a30527b9f435f307a655
---
 .../ui/editors/sql/SQLEditorInput.java        | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
index 2a21edf6d0..138eee4070 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorInput.java
@@ -42,41 +42,25 @@ public class SQLEditorInput extends ProjectFileEditorInput implements IPersistab
 
     static final Log log = LogFactory.getLog(SQLEditorInput.class);
 
-    private DBSDataSourceContainer dataSourceContainer;
     private String scriptName;
 
     public SQLEditorInput(IFile file)
     {
         super(file);
         this.scriptName = file.getFullPath().removeFileExtension().lastSegment();
-        this.dataSourceContainer = getScriptDataSource(file);
-        if (this.dataSourceContainer == null) {
-            setScriptDataSource(getFile(), null);
-        }
     }
 
     @Override
     public DBSDataSourceContainer getDataSourceContainer()
     {
-        return dataSourceContainer;
-    }
-
-    public void setDataSourceContainer(DBSDataSourceContainer container)
-    {
-        if (dataSourceContainer == container) {
-            return;
-        }
-        dataSourceContainer = container;
-        IFile file = getFile();
-        if (file != null) {
-            setScriptDataSource(file, dataSourceContainer);
-        }
+        return getScriptDataSource(getFile());
     }
 
     @Override
     public String getName()
     {
         String dsName = "<None>";
+        DBSDataSourceContainer dataSourceContainer = getDataSourceContainer();
         if (dataSourceContainer != null) {
             dsName = dataSourceContainer.getName();
         }
@@ -86,6 +70,7 @@ public class SQLEditorInput extends ProjectFileEditorInput implements IPersistab
     @Override
     public String getToolTipText()
     {
+        DBSDataSourceContainer dataSourceContainer = getDataSourceContainer();
         if (dataSourceContainer == null) {
             return super.getName();
         }
-- 
GitLab