Convert Json to CSV issue 2 #325

Cinchoo · Nov 14, 2024 · 6ec324f · 6ec324f
1 parent 64ca012
commit 6ec324f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/ChoETL.NETStandard/ChoETL.NETStandard.csproj b/src/ChoETL.NETStandard/ChoETL.NETStandard.csproj
@@ -17,7 +17,7 @@
 		<PackageTags>ETL c# .NET CSV Xml JSON Flat</PackageTags>
 		<PackageReleaseNotes>.NET Standard version</PackageReleaseNotes>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<Version>1.2.1.67</Version>
+		<Version>1.2.1.68</Version>
 		<AssemblyName>ChoETL.Core</AssemblyName>
 		<RootNamespace>ChoETL</RootNamespace>
 		<SignAssembly>true</SignAssembly>

diff --git a/src/ChoETL/Common/Dynamic/ChoDynamicObject.cs b/src/ChoETL/Common/Dynamic/ChoDynamicObject.cs
@@ -726,7 +726,9 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object
 
         public dynamic Clone()
         {
-            return new ChoDynamicObject(CloneDictionary(_kvpDict));
+            var dobj = new ChoDynamicObject(CloneDictionary(_kvpDict));
+            dobj.DynamicObjectName = _dynamicObjectName;
+            return dobj;
         }
 
         private IDictionary<string, object> CloneDictionary(IDictionary<string, object> dict)
@@ -761,6 +763,10 @@ private object CloneObject(object value)
         {
             if (value == null)
                 return null;
+            else if (value is ChoDynamicObject dobj)
+            {
+                return dobj.Clone();
+            }
             else if (value is IDictionary)
                 return CloneDictionary(value as IDictionary);
             else if (value is IDictionary<string, object>)

diff --git a/src/ChoETL/Common/ExtensionMethods/ChoDictionaryEx.cs b/src/ChoETL/Common/ExtensionMethods/ChoDictionaryEx.cs
@@ -202,7 +202,8 @@ public static IEnumerable<dynamic> FlattenBy(this IEnumerable dicts, params stri
         {
             return FlattenBy(dicts, fields, false);
         }
-        public static IEnumerable<dynamic> FlattenBy(this IEnumerable dicts, string[] fields, bool turnOffSingularization)
+        public static IEnumerable<dynamic> FlattenBy(this IEnumerable dicts, string[] fields, bool turnOffSingularization,
+            bool ignoreDictionaryFieldPrefix = false, string valueNamePrefix = null)
         {
             var cache = dicts != null ? dicts.OfType<object>().ToArray() : null;
             if (cache == null)
@@ -222,7 +223,7 @@ public static IEnumerable<dynamic> FlattenBy(this IEnumerable dicts, string[] fi
                 {
                     if (rec is IDictionary<string, object>)
                     {
-                        foreach (var child in FlattenBy((IDictionary<string, object>)rec, fields, turnOffSingularization))
+                        foreach (var child in FlattenBy((IDictionary<string, object>)rec, fields, turnOffSingularization, ignoreDictionaryFieldPrefix, valueNamePrefix))
                             yield return child;
                     }
                     else

diff --git a/src/ChoETL/Properties/AssemblyInfo.cs b/src/ChoETL/Properties/AssemblyInfo.cs
@@ -34,6 +34,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.67")] 
-[assembly: AssemblyFileVersion("1.2.1.67")]
+[assembly: AssemblyVersion("1.2.1.68")] 
+[assembly: AssemblyFileVersion("1.2.1.68")]
 //[assembly: ChoAssemblyBetaVersion("beta1")]