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

* Fix memleak in comparer, improve date recognition

Browse Source 
git-svn-id: trunk@43663 -
This commit is contained in:
michael 2019-12-08 20:05:53 +00:00
parent 04a51a622d
commit 4ded1eb698
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/fcl-db/src/json/fpjsondataset.pp
View File

@ -179,6 +179,7 @@ type
Function Compare(aRowindex : integer) : Integer;
Public
Constructor Create(aDataset : TBaseJSONDataset; aFields : String; aValues : Variant; aOptions : TLocateOptions);
Destructor Destroy; override;
Property Dataset : TBaseJSONDataset Read FDataset;
property Items [Index : Integer] : TFieldComparer Read GetFieldComparer;
Property Options : TLocateOptions Read FOptions Write FOptions;
@ -408,6 +409,9 @@ var
begin
S1:=GetFieldValue(Rowindex).AsString;
if varIsNull(aValue) then
S2:=''
else
S2:=String(aValue);
if loPartialKey in Options then
S1:=Copy(S1,1,Length(S2));
@ -543,6 +547,18 @@ begin
ConstructItems(aFields);
end;
destructor TRecordComparer.Destroy;
Var
F : TFieldComparer;
begin
For F in Fitems do
F.Free;
FItems:=Nil;
inherited Destroy;
end;
{ TDefaultJSONIndex }
@ -1049,7 +1065,7 @@ begin
end;
If (Ptrn='') then
Case F.DataType of
ftDate : Result:=StrToDate(S,'y/m/d');
ftDate : Result:=StrToDate(S,'y/m/d','-');
ftTime : Result:=StrToTime(S);
ftDateTime : Result:=StrToDateTime(S);
end
@ -1077,7 +1093,7 @@ begin
end;
If (Ptrn='') then
Case F.DataType of
ftDate : Result:=DateToStr(DT);
ftDate : Result:=FormatDateTime('yyyy/mm/dd',DT);
ftTime : Result:=TimeToStr(DT);
ftDateTime : Result:=DateTimeToStr(DT);
end