Merge pull request #212 from joaoduarte19/serializer_changes

Bug fix in dataset serializer
This commit is contained in:
Daniele Teti 2019-04-17 23:21:50 +02:00 committed by GitHub
commit 857944a334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -50,10 +50,9 @@ uses
type type
TMVCDataSetField = record TMVCDataSetField = record
FieldName: String; FieldName: string;
DataType: TFieldType; DataType: TFieldType;
I: Integer; I: Integer;
IsNull: Boolean;
end; end;
TMVCDataSetFields = TList<TMVCDataSetField>; TMVCDataSetFields = TList<TMVCDataSetField>;
@ -377,7 +376,7 @@ begin
for lField in ADataSetFields do for lField in ADataSetFields do
begin begin
begin begin
if lField.IsNull then if ADataSet.Fields[lField.I].IsNull then
AJsonObject[lField.FieldName] := Null AJsonObject[lField.FieldName] := Null
else else
begin begin
@ -1315,7 +1314,6 @@ begin
ADataSet.Fields[I].FieldName); ADataSet.Fields[I].FieldName);
lField.DataType := ADataSet.Fields[I].DataType; lField.DataType := ADataSet.Fields[I].DataType;
lField.I := I; lField.I := I;
lField.IsNull := ADataSet.Fields[I].IsNull;
case ANameCase of case ANameCase of
ncUpperCase: ncUpperCase:
lField.FieldName := UpperCase(ADataSet.Fields[I].FieldName); lField.FieldName := UpperCase(ADataSet.Fields[I].FieldName);