paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-08 10:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: sqldb:

Browse Source 
- do not allocate cursor when opening bufdataset from file
- when closing TSQLQuery do not deallocate cursor while can be prepared (fixes "[SETUP] unable to close due to unfinalised statements" bug for SQLite)
- when unpreparing statement take into account that there are also SQLConnections which does not support [un]preparation of statements ... bur for those we must still call UnRegisterStatement (fixes multiple "[TEARDOWN] Access violation" in tests)

git-svn-id: trunk@25063 -
This commit is contained in:
lacak 2013-07-08 10:40:27 +00:00
parent 9e4cc57768
commit 8602706228
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -888,8 +888,7 @@ begin
try
DoPrepare;
except
if assigned(FCursor) then
DeAllocateCursor;
DeAllocateCursor;
Raise;
end;
end;
@ -923,7 +922,10 @@ end;
procedure TCustomSQLStatement.Unprepare;
begin
if Prepared then
// Some SQLConnections does not support statement [un]preparation, but they have allocated local cursor(s)
// so let them do cleanup f.e. cancel pending queries and/or free resultset
// and also do UnRegisterStatement!
if assigned(FCursor) then
DoUnprepare;
end;
@ -988,6 +990,7 @@ Var
begin
For I:=0 to FStatements.Count-1 do
TCustomSQLStatement(FStatements[i]).Unprepare;
FStatements.Clear;
end;
destructor TSQLConnection.Destroy;
@ -1625,18 +1628,13 @@ end;
procedure TCustomSQLQuery.InternalClose;
begin
if not IsReadFromPacket then
if assigned(Cursor) then
begin
if assigned(Cursor) and Cursor.FSelectable then
if 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 Prepared then FStatement.DoUnprepare;
end
else
begin
if assigned(Cursor) then
FStatement.DeAllocateCursor;
end;
if DefaultFields then
DestroyFields;
@ -1863,24 +1861,22 @@ procedure TCustomSQLQuery.InternalOpen;
var tel, fieldc : integer;
f : TField;
IndexFields : TStrings;
ReadFromFile: Boolean;
begin
ReadFromFile:=IsReadFromPacket;
if ReadFromFile then
if IsReadFromPacket then
begin
FStatement.AllocateCursor;
Cursor.FSelectable:=True;
Cursor.FStatementType:=stSelect;
// When we read from file there is no need for Cursor, also note that Database may not be assigned
//FStatement.AllocateCursor;
//Cursor.FSelectable:=True;
//Cursor.FStatementType:=stSelect;
FUpdateable:=True;
BindFields(True);
end
else
Prepare;
if not Cursor.FSelectable then
DatabaseError(SErrNoSelectStatement,Self);
if not ReadFromFile then
begin
Prepare;
if not Cursor.FSelectable then
DatabaseError(SErrNoSelectStatement,Self);
// Call UpdateServerIndexDefs before Execute, to avoid problems with connections
// which do not allow processing multiple recordsets at a time. (Microsoft
// calls this MARS, see bug 13241)
@ -1922,9 +1918,7 @@ begin
end
else
BindFields(True);
end
else
BindFields(True);
end;
if not ReadOnly and not FUpdateable and (FSchemaType=stNoSchema) then
begin