Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/DataSet.Serialize.Export.pas
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,22 @@ function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const Is
else
Result.Add(FormatDateTime(TDataSetSerializeConfig.GetInstance.Export.FormatDateTime, ADataSet.Fields[0].AsDateTime));
end;
{$IF NOT DEFINED(FPC)}
{$IF CompilerVersion >= 36.0} // Delphi 12 ou superior
TFieldType.ftTimeStampOffset :
begin
if TDataSetSerializeConfig.GetInstance.DateIsFloatingPoint then
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, {$IF DEFINED(FPC)}LField.AsFloat{$ELSE}TJSONNumber.Create(LField.AsFloat){$ENDIF})
else if TDataSetSerializeConfig.GetInstance.DateTimeIsISO8601 then
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create(DateToISO8601(LField.AsDateTime, TDataSetSerializeConfig.GetInstance.DateInputIsUTC)))
else
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create(FormatDateTime(TDataSetSerializeConfig.GetInstance.Export.FormatDateTime, LField.AsDateTime)));

end;
{$ENDIF}
{$ENDIF}


TFieldType.ftTime:
begin
if TDataSetSerializeConfig.GetInstance.DateIsFloatingPoint then
Expand Down