#2374 Stored procedure exec fix

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -103,7 +103,7 @@
             class="org.jkiss.dbeaver.ui.editors.sql.generator.SQLUtilsPropertyTester"
             id="org.jkiss.dbeaver.ui.editors.sql.generator.SQLUtilsPropertyTester"
             namespace="org.jkiss.dbeaver.ui.editors.sql.util"
-            properties="canGenerate,hasTools,isProcedure"
+            properties="canGenerate,hasTools"
             type="org.eclipse.ui.IWorkbenchPart"/>
         <propertyTester
             class="org.jkiss.dbeaver.ui.controls.resultset.ResultSetPropertyTester"
@@ -1007,10 +1007,14 @@
             </enabledWhen>
         </handler>
         <handler commandId="command.org.jkiss.dbeaver.core.procedure.execute" class="org.jkiss.dbeaver.ui.editors.sql.handlers.RunProcedureConsoleHandler">
-            <parameter
-                    name="org.jkiss.dbeaver.core.resource.link.file.contenttype"
-                    value="org.jkiss.dbeaver.sql">
-            </parameter>
+            <enabledWhen>
+                <with variable="selection">
+                    <count value="+"/>
+                    <iterate operator="and">
+                        <adapt type="org.jkiss.dbeaver.model.struct.rdb.DBSProcedure"/>
+                    </iterate>
+                </with>
+            </enabledWhen>
         </handler>
 
         <handler commandId="org.jkiss.dbeaver.ui.editors.sql.rename" class="org.jkiss.dbeaver.ui.editors.sql.handlers.RenameHandler">
@@ -2091,11 +2095,7 @@
             <command
                   commandId="command.org.jkiss.dbeaver.core.procedure.execute"
                   label="%command.org.jkiss.dbeaver.core.procedure.execute.name">
-                <visibleWhen>
-                    <with variable="activePart">
-                        <test property="org.jkiss.dbeaver.ui.editors.sql.util.isProcedure"/>
-                    </with>
-                </visibleWhen>
+                <visibleWhen checkEnabled="true"/>
             </command>
             <command
                   commandId="org.jkiss.dbeaver.core.sql.editor.forSelection"
@@ -2730,6 +2730,7 @@
             <adapter type="org.jkiss.dbeaver.model.struct.DBSObject"/>
             <adapter type="org.jkiss.dbeaver.model.struct.DBSDataContainer"/>
             <adapter type="org.jkiss.dbeaver.model.struct.DBSDataManipulator"/>
+            <adapter type="org.jkiss.dbeaver.model.struct.rdb.DBSProcedure"/>
             <adapter type="org.jkiss.dbeaver.model.DBPDataSourceContainer"/>
             <adapter type="org.jkiss.dbeaver.model.DBPObject"/>
             <adapter type="org.eclipse.ui.views.properties.IPropertySource"/>

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/generator/SQLUtilsPropertyTester.java

@@ -36,7 +36,6 @@ public class SQLUtilsPropertyTester extends PropertyTester
     public static final String NAMESPACE = "org.jkiss.dbeaver.ui.editors.sql.util";
     public static final String PROP_CAN_GENERATE = "canGenerate";
     public static final String PROP_HAS_TOOLS = "hasTools";
-    public static final String PROP_IS_PROCEDURE = "isProcedure";
 
     public SQLUtilsPropertyTester() {
         super();
@@ -63,13 +62,6 @@ public class SQLUtilsPropertyTester extends PropertyTester
                 DBSObject object = NavigatorUtils.getSelectedObject(structuredSelection);
                 return object != null && !CommonUtils.isEmpty(ToolsRegistry.getInstance().getTools(structuredSelection));
             }
-            case PROP_IS_PROCEDURE: {
-                DBSObject object = NavigatorUtils.getSelectedObject(structuredSelection);
-                return object != null &&
-                        object instanceof DBSProcedure &&
-                        object.getDataSource() != null &&
-                        object.getDataSource() instanceof SQLDataSource;
-            }
         }
         return false;
     }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/BasicSQLDialect.java

@@ -542,7 +542,7 @@ public class BasicSQLDialect implements SQLDialect {
 
     // first line of the call stored procedure SQL (to be overridden)
     protected String getStoredProcedureCallInitialClause(DBSProcedure proc) {
-        return "select " + proc.getName() + "(\n";
+        return "select " + proc.getFullyQualifiedName(DBPEvaluationContext.DML) + "(\n";
     }
 
     @Override