Update source

Update source

Author: JonathanMagnan

src/shared/Z.EF.Plus.Audit.Shared/Audit/AuditEntityAdded.cs

@@ -70,9 +70,11 @@ public static void AuditEntityAdded(AuditEntry auditEntry, ObjectStateEntry obje
                     // Complex Type
                     AuditEntityAdded(auditEntry, objectStateEntry, valueRecord, string.Concat(prefix, name, "."));
                 }
-                else if (objectStateEntry.EntitySet.ElementType.KeyMembers.Any(x => x.Name == name) || auditEntry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(auditEntry.Entry, string.Concat(prefix, name)))
-                {
-                    var auditEntryProperty = auditEntry.Parent.Configuration.AuditEntryPropertyFactory != null ?
+                else if (objectStateEntry.EntitySet.ElementType.KeyMembers.Any(x => x.Name == name) ||
+                         (auditEntry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(auditEntry.Entry, string.Concat(prefix, name))
+                         && !auditEntry.Parent.CurrentOrDefaultConfiguration.IgnorePropertyAdded))
+                { 
+					var auditEntryProperty = auditEntry.Parent.Configuration.AuditEntryPropertyFactory != null ?
                         auditEntry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(auditEntry, objectStateEntry, string.Concat(prefix, name), null, value)) :
                         new AuditEntryProperty();
 
@@ -102,7 +104,8 @@ public static void AuditEntityAdded(AuditEntry entry, EntityEntry objectStateEnt
             {
                 var property = objectStateEntry.Property(propertyEntry.Name);
 
-                if (property.Metadata.IsKey() || entry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(entry.Entry, propertyEntry.Name))
+                if (property.Metadata.IsKey() || (entry.Parent.CurrentOrDefaultConfiguration.IsAuditedProperty(entry.Entry, propertyEntry.Name)
+					&& !entry.Parent.CurrentOrDefaultConfiguration.IgnorePropertyAdded))
                 {
                     var auditEntryProperty = entry.Parent.Configuration.AuditEntryPropertyFactory != null ?
                         entry.Parent.Configuration.AuditEntryPropertyFactory(new AuditEntryPropertyArgs(entry, objectStateEntry, propertyEntry.Name, null, property.CurrentValue)) :
@@ -126,8 +129,8 @@ public static void AuditEntityAdded(AuditEntry entry, EntityEntry objectStateEnt
         }
 #endif
 
-	    // https://stackoverflow.com/questions/2490244/default-value-of-a-type-at-runtime
-	    internal static object DefaultValue(Type type)
+		// https://stackoverflow.com/questions/2490244/default-value-of-a-type-at-runtime
+		internal static object DefaultValue(Type type)
 	    {
 		    if (type.IsValueType)
 			    return Activator.CreateInstance(type);

src/shared/Z.EF.Plus.Audit.Shared/AuditConfiguration.cs

@@ -111,9 +111,13 @@ public AuditConfiguration()
         /// <value>true if unchanged property of a modified entity are audited, false if not.</value>
         public bool IgnorePropertyUnchanged { 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 the property for entity with Added state are audited.</summary>
+        /// <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 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>
@@ -142,12 +146,12 @@ public AuditConfiguration()
         ///     Gets or sets a value indicating whether null value should be used in the Audit instead of DBNull.Value
         /// </summary>
         /// <value>The value indicating whether null value should be used in the Audit instead of DBNull.Value</value>
-        public bool UseNullForDBNullValue { get; set; }
+        public bool UseNullForDBNullValue { get; set; } 
 #endif
 
-        /// <summary>Makes a deep copy of this object.</summary>
-        /// <returns>A copy of this object.</returns>
-        public AuditConfiguration Clone()
+		/// <summary>Makes a deep copy of this object.</summary>
+		/// <returns>A copy of this object.</returns>
+		public AuditConfiguration Clone()
         {
             var audit = new AuditConfiguration
             {
@@ -173,6 +177,7 @@ public AuditConfiguration Clone()
                 SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
                 ExcludeRelationshipIfOneExcluded = ExcludeRelationshipIfOneExcluded,
                 UseUtcDateTime = UseUtcDateTime,
+                IgnorePropertyAdded = IgnorePropertyAdded,
 #if EF5 || EF6
                 UseNullForDBNullValue = UseNullForDBNullValue
 #endif

src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs

@@ -833,8 +833,8 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity)
 				}
 
 				primaryKeys = propertyAndColumnName.Count > 1 ?
-					string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat("\"", x.Item2, "\" = B.\"", x.Item1, "\""))):
-					string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat("\"", x.Item2, "\" = B.\"", x.Item2, "\"")));
+					string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat(tableName + ".\"", x.Item2, "\" = B.\"", x.Item1, "\""))):
+					string.Join(Environment.NewLine + "AND ", propertyAndColumnName.Select(x => string.Concat(tableName + ".\"", x.Item2, "\" = B.\"", x.Item2, "\"")));
 			}
 			else if (isOracle || isDevOracle)
 			{