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

fcl-db: sqldb: Some SQLConnections does not support statement [un]preparation, so let them do cleanup f.e. cancel pending queries and/or free resultset when dataset is closed.

Browse Source 
git-svn-id: trunk@24803 -
This commit is contained in:
lacak 2013-06-04 10:11:38 +00:00
parent c5cf5b5b2f
commit b7d5ed4bd7
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1419,7 +1419,7 @@ begin
if Assigned(Fstatement) then
Result := FStatement.Prepared
else
Result:=False;
Result := False;
end;
function TCustomSQLQuery.AddFilter(SQLstr: string): string;
@ -1448,7 +1448,7 @@ begin
FreeFldBuffers;
FStatement.Unprepare;
FIsEOF := False;
inherited internalclose;
inherited InternalClose;
FStatement.DoPrepare;
FStatement.DoExecute;
inherited InternalOpen;
@ -1575,14 +1575,18 @@ procedure TCustomSQLQuery.InternalClose;
begin
if not IsReadFromPacket then
begin
if assigned(Cursor) and Cursor.FSelectable then FreeFldBuffers;
FStatement.Unprepare;
if assigned(Cursor) and Cursor.FSelectable then
FreeFldBuffers;
// Some SQLConnections does not support statement [un]preparation,
// so let them do cleanup f.e. cancel pending queries and/or free resultset
if not FStatement.Prepared then
FStatement.DoUnprepare;
end
else
begin
begin
if assigned(Cursor) then
FStatement.DeAllocateCursor;
end;
end;
if DefaultFields then
DestroyFields;
FIsEOF := False;
@ -1590,7 +1594,7 @@ begin
if assigned(FInsertQry) then FreeAndNil(FInsertQry);
if assigned(FDeleteQry) then FreeAndNil(FDeleteQry);
// FRecordSize := 0;
inherited internalclose;
inherited InternalClose;
end;
procedure TCustomSQLQuery.InternalInitFieldDefs;