diff --git a/sources/MVCFramework.Serializer.JsonDataObjects.NullableTypes.pas b/sources/MVCFramework.Serializer.JsonDataObjects.NullableTypes.pas deleted file mode 100644 index 24aaedc9..00000000 --- a/sources/MVCFramework.Serializer.JsonDataObjects.NullableTypes.pas +++ /dev/null @@ -1,637 +0,0 @@ -// *************************************************************************** -// -// Delphi MVC Framework -// -// Copyright (c) 2010-2024 Daniele Teti and the DMVCFramework Team -// -// https://github.com/danieleteti/delphimvcframework -// -// Collaborators on this file: Jo�o Ant�nio Duarte (joao.antonioduarte@hotmail.com) -// -// TNullabletypes requires spring4d framework -// -// https://bitbucket.org/sglienke/spring4d.git -// -// *************************************************************************** -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// *************************************************************************** } - -unit MVCFramework.Serializer.JsonDataObjects.NullableTypes; - -interface - -uses - MVCFramework.Serializer.Intf, - MVCFramework.Serializer.Commons, - System.Rtti; - -type - - TNullableIntegerSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableDoubleSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableInt64Serializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableCurrencySerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableStringSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableDateTimeSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableDateSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableTimeSerializer = class(TInterfacedObject, IMVCTypeSerializer) - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - TNullableGuidSerializer = class(TInterfacedObject, IMVCTypeSerializer) - private - function GuidFromString(const AGuidStr: string): TGUID; - public - procedure SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); - - procedure DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); - - procedure DeserializeRoot(const ASerializerObject: TObject; const AObject: TObject; - const AAttributes: TArray); - end; - - /// Register all NullablesSerializers in your serializer - /// Your Serializer -procedure RegisterNullableTypeSerializersInSerializer(ASerializer: IMVCSerializer); - -implementation - -uses - System.SysUtils, - JsonDataObjects, - MVCFramework.Commons, - MVCFramework.NullableTypes; - -procedure RegisterNullableTypeSerializersInSerializer(ASerializer: IMVCSerializer); -begin - Assert(TObject(ASerializer).ClassName = 'TMVCJsonDataObjectsSerializer', - 'Nullables Custom Serializer can be used only with "TMVCJsonDataObjectsSerializer"'); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableInteger), TNullableIntegerSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableInt64), TNullableInt64Serializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableCurrency), TNullableCurrencySerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableString), TNullableStringSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableDateTime), TNullableDateTimeSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableDate), TNullableDateSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableTime), TNullableTimeSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableGuid), TNullableGuidSerializer.Create); - ASerializer.RegisterTypeSerializer(TypeInfo(TNullableDouble), TNullableDoubleSerializer.Create); -end; - -{ TNullableIntegerSerializer } - -procedure TNullableIntegerSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullInt: TNullableInteger; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullInt := nil; - end - else - begin - LNullInt := LJSON.I[APropertyName]; - end; - AElementValue := TValue.From(LNullInt); -end; - -procedure TNullableIntegerSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableIntegerSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullInteger: TNullableInteger; -begin - LNullInteger := AElementValue.AsType; - if LNullInteger.HasValue then - (ASerializerObject as TJDOJsonObject).I[APropertyName] := LNullInteger.Value - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableIntegerSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableInt64Serializer } - -procedure TNullableInt64Serializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullInt64: TNullableInt64; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullInt64 := nil; - end - else - begin - LNullInt64 := LJSON.L[APropertyName]; - end; - AElementValue := TValue.From(LNullInt64); -end; - -procedure TNullableInt64Serializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableInt64Serializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullInt64: TNullableInt64; -begin - LNullInt64 := AElementValue.AsType; - if LNullInt64.HasValue then - (ASerializerObject as TJDOJsonObject).L[APropertyName] := LNullInt64.Value - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableInt64Serializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableCurrencySerializer } - -procedure TNullableCurrencySerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullCurrency: TNullableCurrency; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullCurrency := nil; - end - else - begin - LNullCurrency := Currency(LJSON.F[APropertyName]); - end; - AElementValue := TValue.From(LNullCurrency); -end; - -procedure TNullableCurrencySerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableCurrencySerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullCurrency: TNullableCurrency; -begin - LNullCurrency := AElementValue.AsType; - if LNullCurrency.HasValue then - (ASerializerObject as TJDOJsonObject).F[APropertyName] := LNullCurrency.Value - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableCurrencySerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableStringSerializer } - -procedure TNullableStringSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullString: TNullableString; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullString := nil; - end - else - begin - LNullString := LJSON.S[APropertyName]; - end; - AElementValue := TValue.From(LNullString); -end; - -procedure TNullableStringSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableStringSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullString: TNullableString; -begin - LNullString := AElementValue.AsType; - if LNullString.HasValue then - (ASerializerObject as TJDOJsonObject).S[APropertyName] := LNullString.Value - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableStringSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableDateTimeSerializer } - -procedure TNullableDateTimeSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullDateTime: TNullableDateTime; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullDateTime := nil; - end - else - begin - LNullDateTime := ISOTimeStampToDateTime(LJSON.S[APropertyName]); - end; - AElementValue := TValue.From(LNullDateTime); -end; - -procedure TNullableDateTimeSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableDateTimeSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullDateTime: TNullableDateTime; -begin - LNullDateTime := AElementValue.AsType; - if LNullDateTime.HasValue then - (ASerializerObject as TJDOJsonObject).S[APropertyName] := DateTimeToISOTimeStamp(LNullDateTime.Value) - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableDateTimeSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableDateSerializer } - -procedure TNullableDateSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullDate: TNullableDate; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullDate := nil; - end - else - begin - LNullDate := ISODateToDate(LJSON.S[APropertyName]); - end; - AElementValue := TValue.From(LNullDate); -end; - -procedure TNullableDateSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableDateSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullDate: TNullableDate; -begin - LNullDate := AElementValue.AsType; - if LNullDate.HasValue then - (ASerializerObject as TJDOJsonObject).S[APropertyName] := DateToISODate(LNullDate.Value) - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableDateSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableTimeSerializer } - -procedure TNullableTimeSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullTime: TNullableTime; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullTime := nil; - end - else - begin - LNullTime := ISOTimeToTime(LJSON.S[APropertyName]); - end; - AElementValue := TValue.From(LNullTime); -end; - -procedure TNullableTimeSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableTimeSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullTime: TNullableTime; -begin - LNullTime := AElementValue.AsType; - if LNullTime.HasValue then - (ASerializerObject as TJDOJsonObject).S[APropertyName] := TimeToISOTime(LNullTime.Value) - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableTimeSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableGuidSerializer } - -procedure TNullableGuidSerializer.DeserializeAttribute(var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullGuid: TNullableGuid; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullGuid := nil; - end - else - begin - try - LNullGuid := GuidFromString(LJSON.S[APropertyName]); - except - LNullGuid := nil; - end; - end; - AElementValue := TValue.From(LNullGuid); -end; - -procedure TNullableGuidSerializer.DeserializeRoot(const ASerializerObject, AObject: TObject; - const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -function TNullableGuidSerializer.GuidFromString(const AGuidStr: string): TGUID; -var - LGuidStr: string; -begin - // delphi uuid format: {ae502abe-430b-b23a-2878-2d18d6a6e465} - - // string uuid without braces and dashes: ae502abe430bb23a28782d18d6a6e465 - if AGuidStr.Length = 32 then - LGuidStr := Format('{%s-%s-%s-%s-%s}', [AGuidStr.Substring(0, 8), AGuidStr.Substring(8, 4), - AGuidStr.Substring(12, 4), AGuidStr.Substring(16, 4), AGuidStr.Substring(20, 12)]) - - // string uuid without braces: ae502abe-430b-b23a-2878-2d18d6a6e465 - else if AGuidStr.Length = 36 then - LGuidStr := Format('{%s}', [AGuidStr]) - else - LGuidStr := AGuidStr; - Result := StringToGUID(LGuidStr); -end; - -procedure TNullableGuidSerializer.SerializeAttribute(const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; const AAttributes: TArray); -var - LNullGuid: TNullableGuid; -begin - LNullGuid := AElementValue.AsType; - if LNullGuid.HasValue then - begin - if TMVCSerializerHelper.AttributeExists(AAttributes) then - (ASerializerObject as TJDOJsonObject).S[APropertyName] := TMVCGuidHelper.GUIDToStringEx(LNullGuid.Value) - else - (ASerializerObject as TJDOJsonObject).S[APropertyName] := LNullGuid.Value.ToString - end - else - begin - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; - end; -end; - -procedure TNullableGuidSerializer.SerializeRoot(const AObject: TObject; out ASerializerObject: TObject; - const AAttributes: TArray; const ASerializationAction: TMVCSerializationAction = nil); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -{ TNullableDoubleSerializer } - -procedure TNullableDoubleSerializer.DeserializeAttribute( - var AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; - const AAttributes: TArray); -var - LJSON: TJDOJsonObject; - LNullDouble: TNullableDouble; -begin - LJSON := ASerializerObject as TJDOJsonObject; - if LJSON.Values[APropertyName].Typ in [jdtNone, jdtObject] then { json nulls are recognized as jdtObject } - begin - LNullDouble := nil; - end - else - begin - LNullDouble := LJSON.F[APropertyName]; - end; - AElementValue := TValue.From(LNullDouble); -end; - -procedure TNullableDoubleSerializer.DeserializeRoot(const ASerializerObject, - AObject: TObject; const AAttributes: TArray); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -procedure TNullableDoubleSerializer.SerializeAttribute( - const AElementValue: TValue; const APropertyName: string; - const ASerializerObject: TObject; - const AAttributes: TArray); -var - LNullDouble: TNullableDouble; -begin - LNullDouble := AElementValue.AsType; - if LNullDouble.HasValue then - (ASerializerObject as TJDOJsonObject).F[APropertyName] := LNullDouble.Value - else - (ASerializerObject as TJDOJsonObject).Values[APropertyName] := nil; -end; - -procedure TNullableDoubleSerializer.SerializeRoot(const AObject: TObject; - out ASerializerObject: TObject; const AAttributes: TArray; - const ASerializationAction: TMVCSerializationAction); -begin - raise EMVCSerializationException.Create('Not implemented'); -end; - -end. diff --git a/sources/MVCFramework.Serializer.JsonDataObjects.pas b/sources/MVCFramework.Serializer.JsonDataObjects.pas index b66afa7f..a5078f00 100644 --- a/sources/MVCFramework.Serializer.JsonDataObjects.pas +++ b/sources/MVCFramework.Serializer.JsonDataObjects.pas @@ -864,6 +864,9 @@ begin ftTimeStamp: AJsonArray.Add(DateTimeToISOTimeStamp(SQLTimeStampToDateTime(ADataSet.Fields[lField.I].AsSQLTimeStamp))); + ftTimeStampOffset: + AJsonArray.Add(DateTimeToISOTimeStamp(SQLTimeStampOffsetToDateTime(ADataSet.Fields[lField.I].AsSQLTimeStampOffset))); + ftCurrency: AJsonArray.Add(ADataSet.Fields[lField.I].AsCurrency); @@ -2176,6 +2179,9 @@ begin TFieldType.ftDateTime, TFieldType.ftTimeStamp: Field.AsDateTime := ISOTimeStampToDateTime(AJSONObject.S[lName]); + TFieldType.ftTimeStampOffset: + Field.AsSQLTimeStampOffset := DateTimeToSQLTimeStampOffset(ISOTimeStampToDateTime(AJSONObject.S[lName])); + TFieldType.ftTime: Field.AsDateTime := ISOTimeToTime(AJSONObject.S[lName]); @@ -2299,7 +2305,7 @@ begin Field.AsDateTime := ISOTimeStampToDateTime(AJSONObject.S[lName]); TFieldType.ftTimeStampOffset: - Field.AsSQLTimeStampOffset := StrToSQLTimeStampOffset(AJSONObject.S[lName]); + Field.AsSQLTimeStampOffset := DateTimeToSQLTimeStampOffset(ISOTimeStampToDateTime(AJSONObject.S[lName])); TFieldType.ftTime: Field.AsDateTime := ISOTimeToTime(AJSONObject.S[lName]);