Skip to content

Commit 0a8996c

Browse files
bug fix
1 parent 6637d52 commit 0a8996c

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

src/DataSet.Serialize.Export.pas

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const Is
197197
else
198198
Result.Add(FormatFloat(TDataSetSerializeConfig.GetInstance.Export.FormatFloat, ADataSet.Fields[0].AsFloat));
199199
end;
200-
TFieldType.ftDateTime, TFieldType.ftTimeStamp:
200+
TFieldType.ftDateTime, TFieldType.ftTimeStamp{$IF NOT DEFINED(FPC)}{$IF CompilerVersion >= 36.0}, TFieldType.ftTimeStampOffset{$ENDIF}{$ENDIF}:
201201
begin
202202
if TDataSetSerializeConfig.GetInstance.DateIsFloatingPoint then
203203
Result.Add(ADataSet.Fields[0].AsDateTime)
@@ -206,22 +206,6 @@ function TDataSetSerialize.DataSetToJSONArray(const ADataSet: TDataSet; const Is
206206
else
207207
Result.Add(FormatDateTime(TDataSetSerializeConfig.GetInstance.Export.FormatDateTime, ADataSet.Fields[0].AsDateTime));
208208
end;
209-
{$IF NOT DEFINED(FPC)}
210-
{$IF CompilerVersion >= 36.0} // Delphi 12 ou superior
211-
TFieldType.ftTimeStampOffset :
212-
begin
213-
if TDataSetSerializeConfig.GetInstance.DateIsFloatingPoint then
214-
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, {$IF DEFINED(FPC)}LField.AsFloat{$ELSE}TJSONNumber.Create(LField.AsFloat){$ENDIF})
215-
else if TDataSetSerializeConfig.GetInstance.DateTimeIsISO8601 then
216-
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create(DateToISO8601(LField.AsDateTime, TDataSetSerializeConfig.GetInstance.DateInputIsUTC)))
217-
else
218-
Result.{$IF DEFINED(FPC)}Add{$ELSE}AddPair{$ENDIF}(LKey, TJSONString.Create(FormatDateTime(TDataSetSerializeConfig.GetInstance.Export.FormatDateTime, LField.AsDateTime)));
219-
220-
end;
221-
{$ENDIF}
222-
{$ENDIF}
223-
224-
225209
TFieldType.ftTime:
226210
begin
227211
if TDataSetSerializeConfig.GetInstance.DateIsFloatingPoint then

0 commit comments

Comments
 (0)