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

* Make GetRecNo return 0 on empty and closed datasets

Browse Source 
git-svn-id: trunk@30929 -
This commit is contained in:
blikblum 2015-05-28 14:53:56 +00:00
parent e8175ed0cf
commit a27cee5cfb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fcl-db/src/sqlite/customsqliteds.pas
View File

@ -790,15 +790,13 @@ function TCustomSqliteDataset.GetRecNo: Integer;
var var
TempItem, TempActive: PDataRecord; TempItem, TempActive: PDataRecord;
begin begin
Result := -1; Result := 0;
if (FRecordCount = 0) or (State = dsInsert) then if (FRecordCount = 0) or (State = dsInsert) then
Exit; Exit;
TempItem := FBeginItem; TempItem := FBeginItem;
TempActive := PPDataRecord(ActiveBuffer)^; TempActive := PPDataRecord(ActiveBuffer)^;
if TempActive = FCacheItem then // Record is being edited if TempActive = FCacheItem then // Record is being edited
TempActive := FInternalActiveBuffer; TempActive := FInternalActiveBuffer;
//RecNo is 1 based
Inc(Result);
while TempActive <> TempItem do while TempActive <> TempItem do
begin begin
if TempItem^.Next <> nil then if TempItem^.Next <> nil then
@ -808,9 +806,8 @@ begin
end end
else else
begin begin
Result := -1; Result := 0;
DatabaseError('GetRecNo - ActiveItem Not Found', Self); DatabaseError('GetRecNo - ActiveItem Not Found', Self);
break;
end; end;
end; end;
end; end;