Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 15:55:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/danieleteti/delphimvcframework

Browse Source
This commit is contained in:
Daniele Teti 2019-04-20 12:10:45 +02:00
commit 260445c902
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/MVCFramework.Serializer.JsonDataObjects.pas
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);