Update source

JonathanMagnan · JonathanMagnan · commit 5220b682e637 · 2020-03-24T09:08:44.000-04:00
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs
@@ -39,7 +39,7 @@ public Audit()
             try
             {
 #if !NETSTANDARD1_3
-                CreatedBy = System.Threading.Thread.CurrentPrincipal.Identity.Name;
+                CreatedBy = System.Threading.Thread.CurrentPrincipal?.Identity?.Name;
 #endif
 
                 if (string.IsNullOrEmpty(CreatedBy))
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit/AuditEntityModified.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit/AuditEntityModified.cs
@@ -45,7 +45,17 @@ public static void AuditEntityModified(Audit audit, EntityEntry objectStateEntry
 #elif EFCORE
             AuditEntityModified(audit, entry, objectStateEntry);
 #endif
-            audit.Entries.Add(entry);
+            if (audit.Configuration.IgnoreEntityUnchanged)
+            {
+                if (entry.Properties != null && entry.Properties.Count > 0)
+                { 
+                    audit.Entries.Add(entry);
+                }
+            }
+            else
+            {
+                audit.Entries.Add(entry);
+            } 
         }
 
 #if EF5 || EF6
@@ -58,6 +68,8 @@ public static void AuditEntityModified(Audit audit, EntityEntry objectStateEntry
         /// <param name="prefix">The prefix.</param>
         public static void AuditEntityModified(Audit audit, AuditEntry entry, ObjectStateEntry objectStateEntry, DbDataRecord orginalRecord, DbUpdatableDataRecord currentRecord, string prefix = "")
         {
+            bool hasModified = false;
+
             for (var i = 0; i < orginalRecord.FieldCount; i++)
             {
                 var name = orginalRecord.GetName(i);
@@ -84,8 +96,10 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, ObjectStat
 				else if (objectStateEntry.EntityKey.EntityKeyValues.Any(x => x.Key == name)
                          || entry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(entry.Entry, string.Concat(prefix, name)))
                 {
+                    var isKey = objectStateEntry.EntityKey.EntityKeyValues.Any(x => x.Key == name);
+
                     if (!audit.Configuration.IgnorePropertyUnchanged
-                        || objectStateEntry.EntityKey.EntityKeyValues.Any(x => x.Key == name)
+                        || isKey
                         || !Equals(currentValue, originalValue))
                     {
                         var auditEntryProperty = entry.Parent.Configuration.AuditEntryPropertyFactory != null ?
@@ -94,15 +108,30 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, ObjectStat
 
                         auditEntryProperty.Build(entry, string.Concat(prefix, name), originalValue, currentRecord, i);
                         entry.Properties.Add(auditEntryProperty);
+
+                        if (!isKey)
+                        {
+                            hasModified = true;
+                        }
                     }
                 }
             }
+
+            if (audit.Configuration.IgnoreEntityUnchanged)
+            {
+                if (!hasModified)
+                {
+                    entry.Properties.Clear();
+                }
+            }
         }
 #elif EFCORE
     /// <summary>Audit entity modified.</summary>
     /// <param name="objectStateEntry">The object state entry.</param>
         public static void AuditEntityModified(Audit audit, AuditEntry entry, EntityEntry objectStateEntry)
         {
+            bool hasModified = false;
+
             foreach (var propertyEntry in objectStateEntry.Metadata.GetProperties())
             {
                 var property = objectStateEntry.Property(propertyEntry.Name);
@@ -117,8 +146,21 @@ public static void AuditEntityModified(Audit audit, AuditEntry entry, EntityEntr
 
                         auditEntryProperty.Build(entry, propertyEntry.Name, property.OriginalValue, property);
                         entry.Properties.Add(auditEntryProperty);
+
+                        if (property.IsModified)
+                        {
+                            hasModified = true;
+                        }
                     }
                 }
+            } 
+
+            if (audit.Configuration.IgnoreEntityUnchanged)
+            { 
+                if (!hasModified)
+                {
+                    entry.Properties.Clear(); 
+                }
             }
         }
 #endif
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/AuditConfiguration.cs b/src/shared/Z.EF.Plus.Audit.Shared/AuditConfiguration.cs
@@ -115,9 +115,13 @@ public AuditConfiguration()
         /// <value>true if the property for entity with Added state are audited, false if not.</value>
         public bool IgnorePropertyAdded { get; set; }
 
-		/// <summary>Gets or sets a dictionary indicating if an entity type or a property name is audited.</summary>
-		/// <value>A dictionary indicating if an entity type or a property name is audited.</value>
-		public ConcurrentDictionary<string, bool> IsAuditedDictionary { get; set; }
+        /// <summary>Gets or sets a value indicating whether an entity with no modified property is audited.</summary>
+        /// <value>true if an entity with no modified property should be ignored.</value>
+        public bool IgnoreEntityUnchanged { get; set; }
+
+        /// <summary>Gets or sets a dictionary indicating if an entity type or a property name is audited.</summary>
+        /// <value>A dictionary indicating if an entity type or a property name is audited.</value>
+        public ConcurrentDictionary<string, bool> IsAuditedDictionary { get; set; }
 
         /// <summary>Gets or sets a list of predicates to check if the modified entity is soft added.</summary>
         /// <value>A list of predicates to check if the modified entity is soft added.</value>
@@ -178,6 +182,7 @@ public AuditConfiguration Clone()
                 ExcludeRelationshipIfOneExcluded = ExcludeRelationshipIfOneExcluded,
                 UseUtcDateTime = UseUtcDateTime,
                 IgnorePropertyAdded = IgnorePropertyAdded,
+                IgnoreEntityUnchanged = IgnoreEntityUnchanged,
 #if EF5 || EF6
                 UseNullForDBNullValue = UseNullForDBNullValue
 #endif
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs
@@ -28,6 +28,7 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
+using Microsoft.EntityFrameworkCore.Storage.Internal;
 
 #endif
 
@@ -403,8 +404,13 @@ protected DbCommand CreateCommandCombined()
                 var sql = queryCommand.CommandText;
                 var parameters = queryCommand.Parameters;
 
+                if (parameters.Count == 1 && parameters[0] is CompositeRelationalParameter compositeRelationalParameter)
+                {
+                    parameters = compositeRelationalParameter.RelationalParameters;
+                }
+
                 // UPDATE parameter name
-                foreach (var relationalParameter in queryCommand.Parameters)
+                foreach (var relationalParameter in parameters)
                 {
                     var parameter = queryContext.ParameterValues[relationalParameter.InvariantName];
 
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureValue.cs
@@ -18,7 +18,7 @@
 
 #elif EF6
 using System.Data.Entity.Core.Objects;
-#if NET45 
+#if NET45
 using System.Data.Entity.Infrastructure;
 #endif
 
@@ -135,7 +135,17 @@ public override void ExecuteInMemory()
             {
 #if EFCORE
                 var query = (IQueryable<TResult>)Query;
-                var value = query.Provider.Execute<object>(query.Expression);
+
+                object value = null;
+
+                if (!typeof(TResult).IsPrimitive)
+                {
+                    value = query.Provider.Execute<object>(query.Expression);
+                }
+                else
+                {
+                    value = query.Provider.Execute<TResult>(query.Expression);
+                } 
 
                 if (value is TResult valueTResult)
                 {
@@ -175,7 +185,16 @@ public override void GetResultDirectly()
         {
             var query = (IQueryable<TResult>) Query;
 #if EFCORE_3X
-            var value = query.Provider.Execute<object>(query.Expression);
+            object value = null;
+
+            if (!typeof(TResult).IsPrimitive)
+            {
+                value =  query.Provider.Execute<object>(query.Expression);
+            }
+            else
+            {
+                value = query.Provider.Execute<TResult>(query.Expression);
+            } 
 
             if (value is TResult valueTResult)
             {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public Audit()`
`39`	`39`	`try`
`40`	`40`	`{`
`41`	`41`	`#if !NETSTANDARD1_3`
`42`		`- CreatedBy = System.Threading.Thread.CurrentPrincipal.Identity.Name;`
	`42`	`+ CreatedBy = System.Threading.Thread.CurrentPrincipal?.Identity?.Name;`
`43`	`43`	`#endif`
`44`	`44`
`45`	`45`	`if (string.IsNullOrEmpty(CreatedBy))`