opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support cancel button in "Run routine" action. Fixes issue #3151.

Browse Source
This commit is contained in:
Ansgar Becker
2013-06-14 04:59:42 +00:00
parent f2a89f28b8
commit 1eb32a1e0f
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/main.pas
View File

@ -3429,6 +3429,7 @@ var
Objects: TDBObjectList;
Parameters: TRoutineParamList;
Param: TRoutineParam;
Cancelled: Boolean;
begin
// Run stored function(s) or procedure(s)
Objects := GetFocusedObjects(Sender, [lntProcedure, lntFunction]);
@ -3451,23 +3452,33 @@ begin
Parameters := TRoutineParamList.Create;
Obj.Connection.ParseRoutineStructure(Obj, Parameters);
Query := Query + Obj.QuotedName;
Cancelled := False;
Params := TStringList.Create;
for Param in Parameters do begin
ParamValue := InputBox(Obj.Name, _('Parameter')+' "'+Param.Name+'" ('+Param.Datatype+')', '');
ParamValue := '';
if not InputQuery(Obj.Name, _('Parameter')+' "'+Param.Name+'" ('+Param.Datatype+')', ParamValue) then begin
Cancelled := True;
Break;
end;
ParamValue := Obj.Connection.EscapeString(ParamValue);
Params.Add(ParamValue);
end;
Parameters.Free;
ParamValues := '';
case Obj.Connection.Parameters.NetTypeGroup of
ngMySQL:
ParamValues := '(' + ImplodeStr(', ', Params) + ')';
ngMSSQL:
ParamValues := ' ' + ImplodeStr(' ', Params);
if not Cancelled then begin
Parameters.Free;
ParamValues := '';
case Obj.Connection.Parameters.NetTypeGroup of
ngMySQL:
ParamValues := '(' + ImplodeStr(', ', Params) + ')';
ngMSSQL:
ParamValues := ' ' + ImplodeStr(' ', Params);
end;
Query := Query + ParamValues;
Tab.Memo.Text := Query;
actExecuteQueryExecute(Sender);
end;
Query := Query + ParamValues;
Tab.Memo.Text := Query;
actExecuteQueryExecute(Sender);
// Also cancel the whole loop over multiple procedures
if Cancelled then
Break;
end;
end;