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

* Fix for record no, recno tests pass

Browse Source 
git-svn-id: trunk@30467 -
This commit is contained in:
michael 2015-04-06 16:33:26 +00:00
parent 640efba580
commit 2412a2faa2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/fcl-db/src/sdf/sdfdata.pp
View File

@ -509,8 +509,8 @@ function TFixedFormatDataSet.GetRecNo: Longint;
var var
BufPtr: TRecordBuffer; BufPtr: TRecordBuffer;
begin begin
Result := -1; Result := 0;
if GetActiveRecBuf(BufPtr) then if GetActiveRecBuf(BufPtr) and Not (State in dsEditModes) then
Result := PRecInfo(BufPtr + FRecInfoOfs)^.RecordNumber; Result := PRecInfo(BufPtr + FRecInfoOfs)^.RecordNumber;
end; end;
@ -737,7 +737,7 @@ begin
FData[FCurRec] := BufToStore(ActiveBuffer); FData[FCurRec] := BufToStore(ActiveBuffer);
end end
else else
InternalAddRecord(ActiveBuffer, FALSE); InternalAddRecord(ActiveBuffer, True);
end; end;
procedure TFixedFormatDataSet.InternalEdit; procedure TFixedFormatDataSet.InternalEdit;
@ -754,15 +754,24 @@ begin
end; end;
procedure TFixedFormatDataSet.InternalAddRecord(Buffer: Pointer; DoAppend: Boolean); procedure TFixedFormatDataSet.InternalAddRecord(Buffer: Pointer; DoAppend: Boolean);
Var
I : Integer;
begin begin
FSaveChanges := TRUE; FSaveChanges := TRUE;
Inc(FLastBookmark); Inc(FLastBookmark);
if DoAppend then if DoAppend then
begin
InternalLast; InternalLast;
if (FCurRec >=0) then
FData.InsertObject(FCurRec, BufToStore(Buffer), TObject(Pointer(FLastBookmark)))
else
FData.AddObject(BufToStore(Buffer), TObject(Pointer(FLastBookmark))); FData.AddObject(BufToStore(Buffer), TObject(Pointer(FLastBookmark)));
end
else if (FCurRec-FDataOffset>=0) then
begin
For I:=FCurRec+FDataOffset to FData.Count-1 do
FData.Objects[i]:=TObject(FCurRec+FDataOffset+1);
FData.InsertObject(FCurRec+FDataOffset, BufToStore(Buffer), TObject(Pointer(FCurRec)))
end
end; end;
procedure TFixedFormatDataSet.InternalGotoBookmark(ABookmark: Pointer); procedure TFixedFormatDataSet.InternalGotoBookmark(ABookmark: Pointer);