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

* Reset default to RFC3339 date handling if no format specified

Browse Source
This commit is contained in:
michael 2019-05-20 18:56:26 +00:00
parent 0a0fd7dfe0
commit c5d66bd192
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/fcl-db/jsondataset.pas
View File

@ -1092,7 +1092,6 @@ begin
Result:=Null Result:=Null
else else
Result:=FormatDateTimeField(aValue,aField) Result:=FormatDateTimeField(aValue,aField)
end; end;
@ -1557,15 +1556,9 @@ begin
Ptrn:=(F as TJSONDateTimeField).DateTimeFormat; Ptrn:=(F as TJSONDateTimeField).DateTimeFormat;
end; end;
If (Ptrn='') then If (Ptrn='') then
Case F.DataType of Result := DefaultConvertToDateTime(F,S,True)
ftDate : Result:=StrToDate(S);
ftTime : Result:=StrToTime(S);
ftDateTime : Result:=StrToDateTime(S);
end
else else
begin
Result:=ScanDateTime(ptrn,S,1); Result:=ScanDateTime(ptrn,S,1);
end;
end; end;
function TBaseJSONDataSet.FormatDateTimeField(DT: TDateTime; F: TField function TBaseJSONDataSet.FormatDateTimeField(DT: TDateTime; F: TField
@ -1585,11 +1578,7 @@ begin
Ptrn:=TJSONDateTimeField(F).DateTimeFormat; Ptrn:=TJSONDateTimeField(F).DateTimeFormat;
end; end;
If (Ptrn='') then If (Ptrn='') then
Case F.DataType of Result := DateTimeToRFC3339(DT)
ftDate : Result:=DateToStr(DT);
ftTime : Result:=TimeToStr(DT);
ftDateTime : Result:=DateTimeToStr(DT);
end
else else
Result:=FormatDateTime(ptrn,DT); Result:=FormatDateTime(ptrn,DT);
end; end;