Skip to content

Commit 905eb8f

Browse files
committed
fix: stuck UI after firing query with SQL error on MS SQL
Refs #2601
1 parent 9a209eb commit 905eb8f

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

‎source/dbconnection.pas‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3709,6 +3709,7 @@ procedure TSqlSrvConnection.Query(SQL: String; DoStoreResult: Boolean=False; Log
37093709

37103710
TimerStart := GetTickCount64;
37113711
FLastRawResults.Clear;
3712+
QueryResult := nil;
37123713
try
37133714
QueryResult := TSQLQuery.Create(FHandle);
37143715
FLastRawResults.Add(QueryResult);
@@ -3726,6 +3727,8 @@ procedure TSqlSrvConnection.Query(SQL: String; DoStoreResult: Boolean=False; Log
37263727
except
37273728
on E:Exception do begin
37283729
FLastError := E.Message;
3730+
FLastRawResults.Clear;
3731+
QueryResult.Free;
37293732
Log(lcError, GetLastErrorMsg);
37303733
raise EDbError.Create(GetLastErrorMsg);
37313734
end;

0 commit comments

Comments
 (0)