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

* Fix from mattias Gartner for issue ID #38509, correctly rest index on close/reopen

Browse Source 
git-svn-id: trunk@48711 -
This commit is contained in:
michael 2021-02-18 15:10:05 +00:00
parent 22ad12d5b7
commit 600a5dd13f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/fcl-db/src/base/bufdataset.pas
View File

@ -1465,6 +1465,7 @@ var
i,r : integer;
iGetResult : TGetResult;
pc : TRecordBuffer;
CurBufIndex: TBufDatasetIndex;
begin
FOpen:=False;
@ -1514,10 +1515,17 @@ begin
if FAutoIncValue>-1 then FAutoIncValue:=1;
if assigned(FParser) then FreeAndNil(FParser);
For I:=FIndexes.Count-1 downto 0 do
if (BufIndexDefs[i].IndexType in [itDefault,itCustom]) or (BufIndexDefs[i].DiscardOnClose) then
BufIndexDefs[i].Free
begin
CurBufIndex:=BufIndexDefs[i];
if (CurBufIndex.IndexType in [itDefault,itCustom]) or (CurBufIndex.DiscardOnClose) then
begin
if FCurrentIndexDef=CurBufIndex then
FCurrentIndexDef:=nil;
CurBufIndex.Free;
end
else
FreeAndNil(BufIndexDefs[i].FBufferIndex);
FreeAndNil(CurBufIndex.FBufferIndex);
end;
end;
procedure TCustomBufDataset.InternalFirst;
@ -3149,16 +3157,18 @@ function TCustomBufDataset.GetIndexFieldNames: String;
var
i, p: integer;
s: string;
IndexBuf: TBufIndex;
begin
Result := FIndexFieldNames;
if (CurrentIndexBuf=Nil) then
IndexBuf:=CurrentIndexBuf;
if (IndexBuf=Nil) then
Exit;
Result:='';
for i := 1 to WordCount(CurrentIndexBuf.FieldsName, [Limiter]) do
for i := 1 to WordCount(IndexBuf.FieldsName, [Limiter]) do
begin
s := ExtractDelimited(i, CurrentIndexBuf.FieldsName, [Limiter]);
p := Pos(s, CurrentIndexBuf.DescFields);
s := ExtractDelimited(i, IndexBuf.FieldsName, [Limiter]);
p := Pos(s, IndexBuf.DescFields);
if p>0 then
s := s + Desc;
Result := Result + Limiter + s;