paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 19:48:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Guard against the case connection is nil when closing datasets

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-12-21 13:31:58 +01:00
parent 5f845aa8ff
commit 2a281b6be6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/fcl-db/src/sqldb/sqldb.pp
View File

@ -2518,13 +2518,21 @@ Const
var var
Q : TSQLQuery; Q : TSQLQuery;
C : TSQLConnection;
begin begin
Q:=DS as TSQLQuery; Q:=DS as TSQLQuery;
if not (sqoKeepOpenOnCommit in Q.Options) then if not (sqoKeepOpenOnCommit in Q.Options) then
inherited CloseDataset(Q,InCommit); inherited CloseDataset(Q,InCommit);
if UnPrepOptions[InCommit] in SQLConnection.ConnOptions then C:=SQLConnection;
Q.UnPrepare; if C=Nil then
C:=Q.SQLConnection;
if Q.Prepared then
if not Assigned(C) then
// No database, we must unprepare...
Q.UnPrepare // Unprepare checks if there is still a cursor.
else if UnPrepOptions[InCommit] in C.ConnOptions then
Q.UnPrepare;
end; end;
procedure TSQLTransaction.Commit; procedure TSQLTransaction.Commit;