Fixing Audit Clone method

zzzprojects · zzzprojects · commit 03d4c66f6bfc · 2016-10-21T17:54:56.000-04:00
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/Audit/AuditConfiguration.cs b/src/Z.EntityFramework.Plus.EF5.NET40/Audit/AuditConfiguration.cs
@@ -47,8 +47,12 @@ public AuditConfiguration()
 #endif
         }
 
+        /// <summary>Gets or sets the audit entry factory.</summary>
+        /// <value>The audit entry factory.</value>
         public Func<AuditEntryFactoryArgs, AuditEntry> AuditEntryFactory { get; set; }
 
+        /// <summary>Gets or sets the audit entry property factory.</summary>
+        /// <value>The audit entry property factory.</value>
         public Func<AuditEntryPropertyArgs, AuditEntryProperty> AuditEntryPropertyFactory { get; set; }
 
         /// <summary>Gets or sets the automatic audit save pre action.</summary>
@@ -129,6 +133,8 @@ public AuditConfiguration Clone()
         {
             var audit = new AuditConfiguration
             {
+                AuditEntryFactory = AuditEntryFactory,
+                AuditEntryPropertyFactory = AuditEntryPropertyFactory,
                 AutoSavePreAction = AutoSavePreAction,
                 IgnoreEntityAdded = IgnoreEntityAdded,
                 IgnoreEntityModified = IgnoreEntityModified,
@@ -142,7 +148,10 @@ public AuditConfiguration Clone()
                 ExcludeIncludeEntityPredicates = new List<Func<object, bool?>>(ExcludeIncludeEntityPredicates),
                 ExcludeIncludePropertyPredicates = new List<Func<object, string, bool?>>(ExcludeIncludePropertyPredicates),
                 SoftAddedPredicates = new List<Func<object, bool>>(SoftAddedPredicates),
-                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates)
+                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
+#if EF5 || EF6
+                UseNullForDBNullValue = UseNullForDBNullValue
+#endif
             };
 
             return audit;
diff --git a/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.4.8")]
-[assembly: AssemblyFileVersion("1.4.8")]
+[assembly: AssemblyVersion("1.4.9")]
+[assembly: AssemblyFileVersion("1.4.9")]
diff --git a/src/Z.EntityFramework.Plus.EF5/Audit/AuditConfiguration.cs b/src/Z.EntityFramework.Plus.EF5/Audit/AuditConfiguration.cs
@@ -47,8 +47,12 @@ public AuditConfiguration()
 #endif
         }
 
+        /// <summary>Gets or sets the audit entry factory.</summary>
+        /// <value>The audit entry factory.</value>
         public Func<AuditEntryFactoryArgs, AuditEntry> AuditEntryFactory { get; set; }
 
+        /// <summary>Gets or sets the audit entry property factory.</summary>
+        /// <value>The audit entry property factory.</value>
         public Func<AuditEntryPropertyArgs, AuditEntryProperty> AuditEntryPropertyFactory { get; set; }
 
         /// <summary>Gets or sets the automatic audit save pre action.</summary>
@@ -129,6 +133,8 @@ public AuditConfiguration Clone()
         {
             var audit = new AuditConfiguration
             {
+                AuditEntryFactory = AuditEntryFactory,
+                AuditEntryPropertyFactory = AuditEntryPropertyFactory,
                 AutoSavePreAction = AutoSavePreAction,
                 IgnoreEntityAdded = IgnoreEntityAdded,
                 IgnoreEntityModified = IgnoreEntityModified,
@@ -142,7 +148,10 @@ public AuditConfiguration Clone()
                 ExcludeIncludeEntityPredicates = new List<Func<object, bool?>>(ExcludeIncludeEntityPredicates),
                 ExcludeIncludePropertyPredicates = new List<Func<object, string, bool?>>(ExcludeIncludePropertyPredicates),
                 SoftAddedPredicates = new List<Func<object, bool>>(SoftAddedPredicates),
-                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates)
+                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
+#if EF5 || EF6
+                UseNullForDBNullValue = UseNullForDBNullValue
+#endif
             };
 
             return audit;
diff --git a/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF5/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
-[assembly: AssemblyVersion("1.4.8")]
-[assembly: AssemblyFileVersion("1.4.8")]
+[assembly: AssemblyVersion("1.4.9")]
+[assembly: AssemblyFileVersion("1.4.9")]
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditEntityAdded.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditEntityAdded.cs
@@ -6,6 +6,7 @@
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
 #if EF5
+using System;
 using System.Data.Objects;
 using System.Linq;
 
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditRelationshipAdded.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditRelationshipAdded.cs
@@ -8,6 +8,7 @@
 #if EF5 || EF6
 
 #if EF5
+using System;
 using System.Data;
 using System.Data.Objects;
 
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditRelationshipDeleted.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Audit/Audit/AuditRelationshipDeleted.cs
@@ -7,6 +7,7 @@
 
 #if EF5 || EF6
 #if EF5
+using System;
 using System.Data;
 using System.Data.Objects;
 
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Audit/AuditConfiguration.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Audit/AuditConfiguration.cs
@@ -47,8 +47,12 @@ public AuditConfiguration()
 #endif
         }
 
+        /// <summary>Gets or sets the audit entry factory.</summary>
+        /// <value>The audit entry factory.</value>
         public Func<AuditEntryFactoryArgs, AuditEntry> AuditEntryFactory { get; set; }
 
+        /// <summary>Gets or sets the audit entry property factory.</summary>
+        /// <value>The audit entry property factory.</value>
         public Func<AuditEntryPropertyArgs, AuditEntryProperty> AuditEntryPropertyFactory { get; set; }
 
         /// <summary>Gets or sets the automatic audit save pre action.</summary>
@@ -129,6 +133,8 @@ public AuditConfiguration Clone()
         {
             var audit = new AuditConfiguration
             {
+                AuditEntryFactory = AuditEntryFactory,
+                AuditEntryPropertyFactory = AuditEntryPropertyFactory,
                 AutoSavePreAction = AutoSavePreAction,
                 IgnoreEntityAdded = IgnoreEntityAdded,
                 IgnoreEntityModified = IgnoreEntityModified,
@@ -142,7 +148,10 @@ public AuditConfiguration Clone()
                 ExcludeIncludeEntityPredicates = new List<Func<object, bool?>>(ExcludeIncludeEntityPredicates),
                 ExcludeIncludePropertyPredicates = new List<Func<object, string, bool?>>(ExcludeIncludePropertyPredicates),
                 SoftAddedPredicates = new List<Func<object, bool>>(SoftAddedPredicates),
-                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates)
+                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
+#if EF5 || EF6
+                UseNullForDBNullValue = UseNullForDBNullValue
+#endif
             };
 
             return audit;
diff --git a/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6.NET40/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.4.8")]
-[assembly: AssemblyFileVersion("1.4.8")]
+[assembly: AssemblyVersion("1.4.9")]
+[assembly: AssemblyFileVersion("1.4.9")]
diff --git a/src/Z.EntityFramework.Plus.EF6/Audit/AuditConfiguration.cs b/src/Z.EntityFramework.Plus.EF6/Audit/AuditConfiguration.cs
@@ -47,8 +47,12 @@ public AuditConfiguration()
 #endif
         }
 
+        /// <summary>Gets or sets the audit entry factory.</summary>
+        /// <value>The audit entry factory.</value>
         public Func<AuditEntryFactoryArgs, AuditEntry> AuditEntryFactory { get; set; }
 
+        /// <summary>Gets or sets the audit entry property factory.</summary>
+        /// <value>The audit entry property factory.</value>
         public Func<AuditEntryPropertyArgs, AuditEntryProperty> AuditEntryPropertyFactory { get; set; }
 
         /// <summary>Gets or sets the automatic audit save pre action.</summary>
@@ -129,6 +133,8 @@ public AuditConfiguration Clone()
         {
             var audit = new AuditConfiguration
             {
+                AuditEntryFactory = AuditEntryFactory,
+                AuditEntryPropertyFactory = AuditEntryPropertyFactory,
                 AutoSavePreAction = AutoSavePreAction,
                 IgnoreEntityAdded = IgnoreEntityAdded,
                 IgnoreEntityModified = IgnoreEntityModified,
@@ -142,7 +148,10 @@ public AuditConfiguration Clone()
                 ExcludeIncludeEntityPredicates = new List<Func<object, bool?>>(ExcludeIncludeEntityPredicates),
                 ExcludeIncludePropertyPredicates = new List<Func<object, string, bool?>>(ExcludeIncludePropertyPredicates),
                 SoftAddedPredicates = new List<Func<object, bool>>(SoftAddedPredicates),
-                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates)
+                SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
+#if EF5 || EF6
+                UseNullForDBNullValue = UseNullForDBNullValue
+#endif
             };
 
             return audit;
diff --git a/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs
@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.4.8")]
-[assembly: AssemblyFileVersion("1.4.8")]
+[assembly: AssemblyVersion("1.4.9")]
+[assembly: AssemblyFileVersion("1.4.9")]
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityAdded.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityAdded.cs
@@ -6,10 +6,12 @@
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
 #if EF5
+using System;
 using System.Data.Objects;
 using System.Linq;
 
 #elif EF6
+using System;
 using System.Data.Entity.Core.Objects;
 using System.Linq;
 
@@ -71,6 +73,11 @@ public static void AuditEntityAdded(AuditEntry auditEntry, ObjectStateEntry obje
                 var name = record.GetName(i);
                 var value = record.GetValue(i);
 
+                if (auditEntry.Parent.Configuration.UseNullForDBNullValue && value == DBNull.Value)
+                {
+                    value = null;
+                }
+
                 var valueRecord = value as DbUpdatableDataRecord;
                 if (valueRecord != null)
                 {
@@ -80,8 +87,8 @@ public static void AuditEntityAdded(AuditEntry auditEntry, ObjectStateEntry obje
                 else if (objectStateEntry.EntitySet.ElementType.KeyMembers.Any(x => x.Name == name) || auditEntry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(auditEntry.Entry, name))
                 {
                     var auditEntryProperty = auditEntry.Parent.Configuration.AuditEntryPropertyFactory != null ?
-    auditEntry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(auditEntry, objectStateEntry, string.Concat(prefix, name), null, value)) :
-    new AuditEntryProperty();
+                        auditEntry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(auditEntry, objectStateEntry, string.Concat(prefix, name), null, value)) :
+                        new AuditEntryProperty();
 
                     auditEntryProperty.Build(auditEntry, string.Concat(prefix, name), null, value);
                     auditEntry.Properties.Add(auditEntryProperty);
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityDeleted.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityDeleted.cs
@@ -5,6 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
+using System;
 using System.Data.Common;
 using System.Linq;
 
@@ -61,6 +62,11 @@ public static void AuditEntityDeleted(AuditEntry entry, ObjectStateEntry objectS
                 var name = record.GetName(i);
                 var value = record.GetValue(i);
 
+                if (entry.Parent.Configuration.UseNullForDBNullValue && value == DBNull.Value)
+                {
+                    value = null;
+                }
+
                 var valueRecord = value as DbDataRecord;
                 if (valueRecord != null)
                 {
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityModified.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditEntityModified.cs
@@ -5,6 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
+using System;
 using System.Data.Common;
 using System.Linq;
 #if EF5
@@ -63,6 +64,16 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, ObjectStat
                 var originalValue = orginalRecord.GetValue(i);
                 var currentValue = currentRecord.GetValue(i);
 
+                if (audit.Configuration.UseNullForDBNullValue && originalValue == DBNull.Value)
+                {
+                    originalValue = null;
+                }
+
+                if (audit.Configuration.UseNullForDBNullValue && currentValue == DBNull.Value)
+                {
+                    currentValue = null;
+                }
+
                 var valueRecord = originalValue as DbDataRecord;
                 if (valueRecord != null)
                 {
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditRelationshipAdded.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditRelationshipAdded.cs
@@ -8,10 +8,12 @@
 #if EF5 || EF6
 
 #if EF5
+using System;
 using System.Data;
 using System.Data.Objects;
 
 #elif EF6
+using System;
 using System.Data.Entity.Core;
 using System.Data.Entity.Core.Objects;
 
@@ -57,21 +59,35 @@ public static void AuditRelationAdded(Audit audit, EntityEntry objectStateEntry)
 
                 foreach (var keyValue in leftKeys.EntityKeyValues)
                 {
+                    var value = keyValue.Value;
+
+                    if (audit.Configuration.UseNullForDBNullValue && value == DBNull.Value)
+                    {
+                        value = null;
+                    }
+
                     var auditEntryProperty = entry.Parent.Configuration.AuditEntryPropertyFactory != null ?
-entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, leftRelationName, keyValue.Key, null, keyValue.Value)) :
+entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, leftRelationName, keyValue.Key, null, value)) :
 new AuditEntryProperty();
 
-                    auditEntryProperty.Build(entry, leftRelationName, keyValue.Key, null, keyValue.Value);
+                    auditEntryProperty.Build(entry, leftRelationName, keyValue.Key, null, value);
                     entry.Properties.Add(auditEntryProperty);
                 }
 
                 foreach (var keyValue in rightKeys.EntityKeyValues)
                 {
+                    var value = keyValue.Value;
+
+                    if (audit.Configuration.UseNullForDBNullValue && value == DBNull.Value)
+                    {
+                        value = null;
+                    }
+
                     var auditEntryProperty = entry.Parent.Configuration.AuditEntryPropertyFactory != null ?
-entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, rightRelationName, keyValue.Key, null, keyValue.Value)) :
+entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, rightRelationName, keyValue.Key, null, value)) :
 new AuditEntryProperty();
 
-                    auditEntryProperty.Build(entry, rightRelationName, keyValue.Key, null, keyValue.Value);
+                    auditEntryProperty.Build(entry, rightRelationName, keyValue.Key, null, value);
                     entry.Properties.Add(auditEntryProperty);
                 }
             }
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditRelationshipDeleted.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/Audit/AuditRelationshipDeleted.cs
@@ -7,10 +7,12 @@
 
 #if EF5 || EF6
 #if EF5
+using System;
 using System.Data;
 using System.Data.Objects;
 
 #elif EF6
+using System;
 using System.Data.Entity.Core;
 using System.Data.Entity.Core.Objects;
 
@@ -33,8 +35,8 @@ public static void AuditRelationDeleted(Audit audit, EntityEntry objectStateEntr
 #endif
         {
             var entry = audit.Configuration.AuditEntryFactory != null ?
-audit.Configuration.AuditEntryFactory(new AuditEntryFactoryArgs(audit, objectStateEntry, AuditEntryState.RelationshipDeleted)) :
-new AuditEntry();
+                audit.Configuration.AuditEntryFactory(new AuditEntryFactoryArgs(audit, objectStateEntry, AuditEntryState.RelationshipDeleted)) :
+                new AuditEntry();
 
             entry.Build(audit, objectStateEntry);
             entry.State = AuditEntryState.RelationshipDeleted;
@@ -43,14 +45,21 @@ public static void AuditRelationDeleted(Audit audit, EntityEntry objectStateEntr
             for (var i = 0; i < values.FieldCount; i++)
             {
                 var relationName = values.GetName(i);
-                var value = (EntityKey) values.GetValue(i);
-                foreach (var keyValue in value.EntityKeyValues)
+                var entityKey = (EntityKey) values.GetValue(i);
+                foreach (var keyValue in entityKey.EntityKeyValues)
                 {
+                    var value = keyValue.Value;
+
+                    if (audit.Configuration.UseNullForDBNullValue && value == DBNull.Value)
+                    {
+                        value = null;
+                    }
+
                     var auditEntryProperty = entry.Parent.Configuration.AuditEntryPropertyFactory != null ?
-entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, relationName, keyValue.Key, keyValue.Value, null)) :
-new AuditEntryProperty();
+                        entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, relationName, keyValue.Key, value, null)) :
+                        new AuditEntryProperty();
 
-                    auditEntryProperty.Build(entry, relationName, keyValue.Key, keyValue.Value, null);
+                    auditEntryProperty.Build(entry, relationName, keyValue.Key, value, null);
                     entry.Properties.Add(auditEntryProperty);
                 }
             }
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/AuditConfiguration.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/AuditConfiguration.cs
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/AuditConfiguration/FormatValue.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/AuditConfiguration/FormatValue.cs
diff --git a/src/Z.EntityFramework.Plus.EFCore/Audit/AuditEntryProperty.cs b/src/Z.EntityFramework.Plus.EFCore/Audit/AuditEntryProperty.cs
diff --git a/src/Z.EntityFramework.Plus.EFCore/Properties/AssemblyInfo.cs b/src/Z.EntityFramework.Plus.EFCore/Properties/AssemblyInfo.cs
diff --git a/src/Z.EntityFramework.Plus.EFCore/project.json b/src/Z.EntityFramework.Plus.EFCore/project.json
diff --git a/version.txt b/version.txt
