mirror of
https://github.com/HeidiSQL/HeidiSQL.git
synced 2025-08-16 11:42:12 +08:00
Bugfix: 'stop on errors when executing sql batch' got broken in revision 667.
This commit is contained in:
@ -2846,7 +2846,7 @@ begin
|
|||||||
try
|
try
|
||||||
if ( ExpectResultSet( SQL[i] ) ) then
|
if ( ExpectResultSet( SQL[i] ) ) then
|
||||||
begin
|
begin
|
||||||
ds := GetResults( SQL[i] );
|
ds := GetResults( SQL[i], false, false );
|
||||||
gridQuery.DataSource.DataSet := ds;
|
gridQuery.DataSource.DataSet := ds;
|
||||||
if ( ds.Active ) then
|
if ( ds.Active ) then
|
||||||
begin
|
begin
|
||||||
@ -2862,7 +2862,7 @@ begin
|
|||||||
end
|
end
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
rowsaffected := rowsaffected + ExecUpdateQuery( SQL[i] );
|
rowsaffected := rowsaffected + ExecUpdateQuery( SQL[i], false, false );
|
||||||
fieldcount := 0;
|
fieldcount := 0;
|
||||||
recordcount := 0;
|
recordcount := 0;
|
||||||
end;
|
end;
|
||||||
@ -2875,16 +2875,11 @@ begin
|
|||||||
) then
|
) then
|
||||||
begin
|
begin
|
||||||
Screen.Cursor := crDefault;
|
Screen.Cursor := crDefault;
|
||||||
LogSQL( E.Message, true );
|
|
||||||
MessageDlg( E.Message, mtError, [mbOK], 0 );
|
MessageDlg( E.Message, mtError, [mbOK], 0 );
|
||||||
ProgressBarQuery.Hide();
|
ProgressBarQuery.Hide();
|
||||||
Mainform.ExecuteQuery.Enabled := true;
|
Mainform.ExecuteQuery.Enabled := true;
|
||||||
Mainform.ExecuteSelection.Enabled := true;
|
Mainform.ExecuteSelection.Enabled := true;
|
||||||
Break;
|
Break;
|
||||||
end
|
|
||||||
else
|
|
||||||
begin
|
|
||||||
LogSQL( E.Message, true );
|
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
Reference in New Issue
Block a user