Merge pull request #42 from mateusvicente100/master

Issue #41 Padrão lowerCamelCase no nome do DataSet
viniciussanchez · May 6, 2020 · 16a1035 · 16a1035
2 parents b94cc8e + e58b748
commit 16a1035
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/core/DataSet.Serialize.Export.pas b/src/core/DataSet.Serialize.Export.pas
@@ -206,7 +206,7 @@ function TDataSetSerialize.DataSetToJSONObject(const ADataSet: TDataSet): TJSONO
         if FOnlyUpdatedRecords then
           TFDDataSet(LNestedDataSet).FilterChanges := [rtInserted, rtModified, rtDeleted, rtUnmodified];
         if LNestedDataSet.RecordCount > 0 then
-          Result.AddPair(LowerCase(TDataSetSerializeUtils.FormatDataSetName(LNestedDataSet.Name)), DataSetToJSONArray(LNestedDataSet, True));
+          Result.AddPair(TDataSetSerializeUtils.FormatDataSetName(LNestedDataSet.Name), DataSetToJSONArray(LNestedDataSet, True));
         if FOnlyUpdatedRecords then
           TFDDataSet(LNestedDataSet).FilterChanges := [rtInserted, rtModified, rtUnmodified];
       end;

diff --git a/src/core/DataSet.Serialize.Import.pas b/src/core/DataSet.Serialize.Import.pas
@@ -318,7 +318,7 @@ procedure TJSONSerialize.JSONObjectToDataSet(const AJSONObject: TJSONObject; con
     ADataSet.GetDetailDataSets(LDataSetDetails);
     for LNestedDataSet in LDataSetDetails do
     begin
-      if not AJSONObject.TryGetValue(LowerCase(TDataSetSerializeUtils.FormatDataSetName(LNestedDataSet.Name)), LJSONValue) then
+      if not AJSONObject.TryGetValue(TDataSetSerializeUtils.FormatDataSetName(LNestedDataSet.Name), LJSONValue) then
         Continue;
       if LJSONValue is TJSONNull then
         Continue;

diff --git a/src/providers/DataSet.Serialize.Utils.pas b/src/providers/DataSet.Serialize.Utils.pas
@@ -2,7 +2,7 @@
 
 interface
 
-uses System.DateUtils, System.JSON, Data.DB, DataSet.Serialize.BooleanField, System.SysUtils, System.Classes;
+uses System.DateUtils, System.JSON, Data.DB, DataSet.Serialize.BooleanField, System.SysUtils, System.Classes, System.Character;
 
 type
   /// <summary>
@@ -161,6 +161,8 @@ class function TDataSetSerializeUtils.FieldNameToLowerCamelCase(const AFieldName
 end;
 
 class function TDataSetSerializeUtils.FormatDataSetName(const ADataSetName: string): string;
+const
+  FIRST_CHAR = 1;
 var
   LPrefix: string;
 begin
@@ -171,6 +173,10 @@ class function TDataSetSerializeUtils.FormatDataSetName(const ADataSetName: stri
       Result := Copy(ADataSetName, Succ(LPrefix.Length), ADataSetName.Length - LPrefix.Length);
       Break;
     end;
+  if not TDataSetSerializeConfig.GetInstance.LowerCamelCase then
+    Result := Result.ToLower
+  else
+    Result[FIRST_CHAR] := Result[FIRST_CHAR].ToLower;
 end;
 
 class function TDataSetSerializeUtils.NewDataSetField(const ADataSet: TDataSet; const AFieldStructure: TFieldStructure): TField;