opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 01:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #1029: Syntax Error on Procedure Routine, destroys PR

Browse Source
This commit is contained in:
Ansgar Becker
2009-03-03 20:24:58 +00:00
parent 7789a1d2fe
commit b66a62b9f8
1 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
source/routine_editor.pas
View File

@ -405,9 +405,9 @@ end;
procedure TfrmRoutineEditor.PostChanges(Sender: TObject); procedure TfrmRoutineEditor.PostChanges(Sender: TObject);
var var
sql: WideString; BaseSQL, TempSQL, FinalSQL, TempName: WideString;
i: Integer; i: Integer;
par: TWideStringList; par, allRoutineNames: TWideStringList;
ProcOrFunc: String; ProcOrFunc: String;
begin begin
// Apply or OK button clicked // Apply or OK button clicked
@ -422,32 +422,48 @@ begin
Exit; Exit;
end; end;
sql := 'CREATE '+ProcOrFunc+' '+Mainform.mask(editName.Text)+'('; BaseSQL := '';
for i := 0 to Parameters.Count - 1 do begin for i := 0 to Parameters.Count - 1 do begin
par := explode(DELIM, Parameters[i]); par := explode(DELIM, Parameters[i]);
if ProcOrFunc = 'PROCEDURE' then if ProcOrFunc = 'PROCEDURE' then
sql := sql + par[2] + ' '; BaseSQL := BaseSQL + par[2] + ' ';
sql := sql + par[0] + ' ' + par[1]; BaseSQL := BaseSQL + par[0] + ' ' + par[1];
if i < Parameters.Count-1 then if i < Parameters.Count-1 then
sql := sql + ', '; BaseSQL := BaseSQL + ', ';
end; end;
sql := sql + ') '; BaseSQL := BaseSQL + ') ';
if comboReturns.Enabled then if comboReturns.Enabled then
sql := sql + 'RETURNS '+comboReturns.Text+' '; BaseSQL := BaseSQL + 'RETURNS '+comboReturns.Text+' ';
sql := sql + 'LANGUAGE SQL '; BaseSQL := BaseSQL + 'LANGUAGE SQL ';
if not chkDeterministic.Checked then if not chkDeterministic.Checked then
sql := sql + 'NOT '; BaseSQL := BaseSQL + 'NOT ';
sql := sql + 'DETERMINISTIC '; BaseSQL := BaseSQL + 'DETERMINISTIC ';
sql := sql + UpperCase(comboDataAccess.Text)+' '; BaseSQL := BaseSQL + UpperCase(comboDataAccess.Text)+' ';
sql := sql + 'SQL SECURITY ' + UpperCase(comboSecurity.Text)+' '; BaseSQL := BaseSQL + 'SQL SECURITY ' + UpperCase(comboSecurity.Text)+' ';
sql := sql + 'COMMENT ' + esc(editComment.Text)+' '; BaseSQL := BaseSQL + 'COMMENT ' + esc(editComment.Text)+' ';
sql := sql + SynMemoBody.Text; BaseSQL := BaseSQL + SynMemoBody.Text;
try try
// Drop the old routine first. There is no way to ALTER parameters or the name of it. // There is no way to ALTER parameters or the name of it.
// Create a temp routine, check for syntax errors, then drop the old routine and create it.
// See also: http://dev.mysql.com/doc/refman/5.0/en/alter-procedure.html // See also: http://dev.mysql.com/doc/refman/5.0/en/alter-procedure.html
if AlterRoutineName <> '' then if AlterRoutineName <> '' then begin
Mainform.ExecUpdateQuery('DROP '+AlterRoutineType+' '+Mainform.mask(AlterRoutineName), True); // Create temp name
Mainform.ExecUpdateQuery(sql, False, True); i := 0;
allRoutineNames := Mainform.GetCol('SELECT ROUTINE_NAME FROM '+Mainform.mask(DBNAME_INFORMATION_SCHEMA)+'.'+Mainform.mask('ROUTINES')+' WHERE ROUTINE_SCHEMA = '+esc(Mainform.ActiveDatabase));
while True do begin
inc(i);
TempName := APPNAME + '_temproutine_' + IntToStr(i);
if allRoutineNames.IndexOf(TempName) = -1 then
break;
end;
TempSQL := 'CREATE '+ProcOrFunc+' '+Mainform.mask(tempName)+'(' + BaseSQL;
Mainform.ExecUpdateQuery(TempSQL, False, True);
Mainform.ExecUpdateQuery('DROP '+AlterRoutineType+' IF EXISTS '+Mainform.mask(TempName));
Mainform.ExecUpdateQuery('DROP '+AlterRoutineType+' IF EXISTS '+Mainform.mask(AlterRoutineName));
end;
FinalSQL := 'CREATE '+ProcOrFunc+' '+Mainform.mask(editName.Text)+'(' + BaseSQL;
Mainform.ExecUpdateQuery(FinalSQL, False, True);
// Set editing name if create/alter query was successful // Set editing name if create/alter query was successful
AlterRoutineName := editName.Text; AlterRoutineName := editName.Text;
AlterRoutineType := ProcOrFunc; AlterRoutineType := ProcOrFunc;