# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /home/matthias/NetBeansProjects/core-main
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: db/src/org/netbeans/modules/db/explorer/action/ExecuteCommandAction.java
--- db/src/org/netbeans/modules/db/explorer/action/ExecuteCommandAction.java
+++ db/src/org/netbeans/modules/db/explorer/action/ExecuteCommandAction.java
@@ -42,6 +42,8 @@
 
 package org.netbeans.modules.db.explorer.action;
 
+import java.util.HashSet;
+import java.util.Set;
 import org.netbeans.modules.db.explorer.DatabaseConnection;
 import org.netbeans.modules.db.explorer.sql.editor.SQLEditorSupport;
 import org.openide.nodes.Node;
@@ -49,30 +51,34 @@
 import org.openide.util.NbBundle;
 
 /**
+ * Open an sql editor as an sql console.
  *
  * @author Rob Englander
  */
 public class ExecuteCommandAction extends BaseAction {
-
+    @Override
     protected boolean enable(Node[] activatedNodes) {
-        if (activatedNodes == null || activatedNodes.length != 1) {
-            return false;
+        return true; // This action is always enabled
         }
 
-        boolean enabled = false;
-        DatabaseConnection dbconn = activatedNodes[0].getLookup().lookup(DatabaseConnection.class);
-
-        if (dbconn != null) {
-            enabled = DatabaseConnection.isVitalConnection(dbconn.getConnection(), dbconn);
+    @Override
+    public void performAction (Node[] activatedNodes) {
+        // If exactly one DatabaseConnection can be detected via the activated
+        // nodes, that database connection is set as the default connection
+        Set<DatabaseConnection> dbconnSet = new HashSet<>();
+        if (activatedNodes != null) {
+            for (Node node : activatedNodes) {
+                DatabaseConnection dbconn = node.getLookup().lookup(DatabaseConnection.class);
+                if(dbconn != null) {
+                    dbconnSet.add(dbconn);
         }
-
-        return enabled;
     }
-
-    public void performAction (Node[] activatedNodes) {
-        if (activatedNodes != null && activatedNodes.length == 1) {
-            DatabaseConnection dbconn = activatedNodes[0].getLookup().lookup(DatabaseConnection.class);
+        }
+        if(dbconnSet.size() == 1) {
+            DatabaseConnection dbconn = dbconnSet.iterator().next();
             SQLEditorSupport.openSQLEditor(dbconn.getDatabaseConnection(), "", false); // NOI18N
+        } else {
+            SQLEditorSupport.openSQLEditor(null, "", false); // NOI18N
         }
     }
 
Index: db/src/org/netbeans/modules/db/resources/mf-layer.xml
--- db/src/org/netbeans/modules/db/resources/mf-layer.xml
+++ db/src/org/netbeans/modules/db/resources/mf-layer.xml
@@ -45,7 +45,20 @@
 -->
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 <filesystem>
+    <folder name="Actions">
+        <folder name="Database">
+            <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                <attr name="position" intvalue="100"/>
+            </file>
+        </folder>
+    </folder>
 
+    <folder name="Shortcuts">
+        <file name="AS-Q.shadow">
+            <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance"/>
+        </file>
+    </folder>
+    
     <folder name="Databases">
         <folder name="Explorer">
             <folder name="Root">
@@ -134,7 +147,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="200"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -231,7 +245,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="200"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -252,7 +267,8 @@
                     </file>
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -286,7 +302,8 @@
                     <file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
                         <attr name="position" intvalue="100"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="125"/>
                     </file>
                     <file name="Separator1.instance">
@@ -339,7 +356,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="200"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -363,7 +381,8 @@
                     <file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
                         <attr name="position" intvalue="100"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="200"/>
                     </file>
                     <file name="Separator.instance">
@@ -389,7 +408,8 @@
                     </file>
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -420,7 +440,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="90"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="Separator1.instance">
@@ -441,7 +462,8 @@
                 <folder name="NodeProviders">
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="org-openide-actions-PropertiesAction.shadow">
@@ -466,7 +488,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="250"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="300"/>
                     </file>
                 </folder>
@@ -484,7 +507,8 @@
                         <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
                         <attr name="position" intvalue="200"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="250"/>
                     </file>
                     <file name="Separator2.instance">
@@ -517,7 +541,8 @@
                     </file>
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="org-netbeans-modules-db-explorer-action-RefreshAction.instance">
@@ -534,7 +559,8 @@
                     </file>
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="Separator1.instance">
@@ -553,7 +579,8 @@
                     <file name="org-netbeans-modules-db-explorer-action-ViewDataAction.instance">
                         <attr name="position" intvalue="100"/>
                     </file>
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="200"/>
                     </file>
                     <file name="Separator1.instance">
@@ -574,7 +601,8 @@
                 <folder name="NodeProviders">
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="org-openide-actions-PropertiesAction.shadow">
@@ -587,7 +615,8 @@
                 <folder name="NodeProviders">
                 </folder>
                 <folder name="Actions">
-                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance">
+                    <file name="org-netbeans-modules-db-explorer-action-ExecuteCommandAction.shadow">
+                        <attr name="originalFile" stringvalue="Actions/Database/org-netbeans-modules-db-explorer-action-ExecuteCommandAction.instance" />
                         <attr name="position" intvalue="100"/>
                     </file>
                     <file name="org-openide-actions-PropertiesAction.shadow">