From a0798d81b0ec7199e4af432d2b98e2bb397f848d Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sat, 23 Dec 2017 23:33:41 +0300
Subject: [PATCH] Open SQL console handler fix

Former-commit-id: 3d9716a54cc017572a3dc432aa13ff7e5e164190
---
 .../ui/editors/sql/handlers/OpenObjectConsoleHandler.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenObjectConsoleHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenObjectConsoleHandler.java
index cc0851c3ec..68fe7f409d 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenObjectConsoleHandler.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/handlers/OpenObjectConsoleHandler.java
@@ -56,13 +56,13 @@ public class OpenObjectConsoleHandler extends AbstractHandler {
             HandlerUtil.getCurrentSelection(event));
         List<DBSEntity> entities = new ArrayList<>();
         for (DBSObject object : selectedObjects) {
+            ds = object.getDataSource().getContainer();
             if (object instanceof DBSEntity) {
                 entities.add((DBSEntity) object);
-                ds = object.getDataSource().getContainer();
             }
         }
         DBRRunnableWithResult<String> generator = GenerateSQLContributor.SELECT_GENERATOR(entities, true);
-        openConsole(workbenchWindow, generator, ds, "Query", true);
+        openConsole(workbenchWindow, generator, ds, "Query", !entities.isEmpty());
         return null;
     }
 
-- 
GitLab