opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Catch additional EReadError crash in RunQueryFile

Browse Source
This commit is contained in:
Ansgar Becker
2023-10-23 21:08:09 +02:00
parent 904274d521
commit 2ef4662b48
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/main.pas
View File

@@ -4145,7 +4145,10 @@ var
begin
ProgressDialog.SetLine(1, PChar(_('Clean up ...')), False, Dummy);
Queries.Free;
Stream.Free;
try
Stream.Free;
except; // Eat error when stream wasn't yet created properly
end;
// BringToFront; // Not sure why I added this initially, but it steals focus from other applications
if ProgressDialog.HasUserCancelled then
MessageText := 'File "%s" partially executed, with %s queries and %s affected rows'
@@ -4159,11 +4162,10 @@ begin
ProgressDialog.SetTitle(PChar(f_('Importing file %s', [ExtractFileName(FileName)])));
Dummy := nil;
Result := True;
//Result := True;
Lines := '';
ErrorNotice := '';
QueryCount := 0;
ErrorCount := 0;
RowsAffected := 0;
LinesRemain := '';
Queries := TSQLBatch.Create;
@@ -4242,23 +4244,26 @@ begin
end;
except
on E:EFileStreamError do begin
StopProgress;
Result := False;
ErrorDialog(f_('Error while reading file "%s"', [FileName]), E.Message);
AddOrRemoveFromQueryLoadHistory(FileName, False, True);
end;
on E:EDbError do begin
StopProgress;
Result := False;
ErrorDialog(E.Message + CRLF + CRLF +
f_('Notice: You can disable the "%s" option to ignore such errors', [actQueryStopOnErrors.Caption])
);
end;
on E:EEncodingError do begin
StopProgress;
Result := False;
ErrorDialog(E.Message);
on E:Exception do begin
if (E is EFileStreamError)
or (E is EEncodingError)
or (E is EReadError)
then begin
StopProgress;
Result := False;
ErrorDialog(f_('Error while reading file "%s"', [FileName]), E.Message);
AddOrRemoveFromQueryLoadHistory(FileName, False, True);
end
else if E is EDbError then begin
StopProgress;
Result := False;
ErrorDialog(E.Message + CRLF + CRLF +
f_('Notice: You can disable the "%s" option to ignore such errors', [actQueryStopOnErrors.Caption])
);
end
else begin
raise;
end;
end;
end;
end;