Fix to v1.6.12

zzzprojects · zzzprojects · commit e3c618fe8150 · 2017-08-21T12:22:12.000-04:00
Fix to v1.6.12
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit.cs
@@ -7,9 +7,16 @@
 
 using System;
 using System.Collections.Generic;
-#if EF5 || EF6
+#if EF5 
 using System.Data.Entity;
-
+using System.Data.Objects;
+using System.Reflection;
+using System.Linq.Expressions;
+#elif EF6
+using System.Data.Entity;
+using System.Data.Entity.Core.Objects;
+using System.Reflection;
+using System.Linq.Expressions;
 #elif EFCORE
 using Microsoft.EntityFrameworkCore;
 
@@ -47,6 +54,55 @@ public Audit()
             }
         }
 
+#if EF5 || EF6
+
+        private static Func<ObjectStateEntry, object> RelationshipEntryKey0;
+        private static Func<ObjectStateEntry, object> RelationshipEntryKey1;
+
+        public static object GetRelationshipEntryKey0(ObjectStateEntry entry)
+        {
+            var relationshipEntryType = typeof(ObjectStateEntry).Assembly.GetType("System.Data.Entity.Core.Objects.RelationshipEntry");
+
+            if (RelationshipEntryKey0 == null)
+            {
+                // Parameter
+                var parameter = Expression.Parameter(typeof(ObjectStateEntry));
+
+                // Convert
+                var parameterConvert = Expression.Convert(parameter, relationshipEntryType);
+
+                var key0Property = entry.GetType().GetProperty("Key0", BindingFlags.NonPublic | BindingFlags.Instance);
+                var getKey0 = Expression.Property(parameterConvert, key0Property);
+
+                RelationshipEntryKey0 = Expression.Lambda<Func<ObjectStateEntry, object>>(getKey0, parameter).Compile();
+            }
+
+            return RelationshipEntryKey0(entry);
+        }
+
+        public static object GetRelationshipEntryKey1(ObjectStateEntry entry)
+        {
+            var relationshipEntryType = typeof(ObjectStateEntry).Assembly.GetType("System.Data.Entity.Core.Objects.RelationshipEntry");
+
+            if (RelationshipEntryKey1 == null)
+            {
+                // Parameter
+                var parameter = Expression.Parameter(typeof(ObjectStateEntry));
+
+                // Convert
+                var parameterConvert = Expression.Convert(parameter, relationshipEntryType);
+
+                var key0Property = entry.GetType().GetProperty("Key1", BindingFlags.NonPublic | BindingFlags.Instance);
+                var getKey0 = Expression.Property(parameterConvert, key0Property);
+
+                RelationshipEntryKey1 = Expression.Lambda<Func<ObjectStateEntry, object>>(getKey0, parameter).Compile();
+            }
+
+            return RelationshipEntryKey1(entry);
+        }
+#endif
+
+
         /// <summary>Gets or sets the entries.</summary>
         /// <value>The entries.</value>
         public List<AuditEntry> Entries { get; set; }
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit/AuditRelationshipAdded.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit/AuditRelationshipAdded.cs
@@ -52,7 +52,7 @@ public static void AuditRelationAdded(Audit audit, EntityEntry objectStateEntry)
 #endif
         {
             var values = objectStateEntry.CurrentValues;
-
+          
             var leftKeys = (EntityKey) values.GetValue(0);
             var rightKeys = (EntityKey) values.GetValue(1);
 
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/Audit/PreSaveChanges.cs b/src/shared/Z.EF.Plus.Audit.Shared/Audit/PreSaveChanges.cs
@@ -46,6 +46,25 @@ public static void PreSaveChanges(Audit audit, DbContext context)
                 // Relationship
                 if (objectStateEntry.IsRelationship)
                 {
+                    var leftKey = GetRelationshipEntryKey0(objectStateEntry);
+                    var rightKey = GetRelationshipEntryKey1(objectStateEntry);
+
+                    var leftEntity = objectContext.ObjectStateManager.GetObjectStateEntry(leftKey);
+                    var rightEntity = objectContext.ObjectStateManager.GetObjectStateEntry(rightKey);
+
+                    var leftIsAudited = audit.CurrentOrDefaultConfiguration.IsAuditedEntity(leftEntity);
+                    var rightIsAudited = audit.CurrentOrDefaultConfiguration.IsAuditedEntity(rightEntity);
+
+                    if(audit.CurrentOrDefaultConfiguration.ExcludeRelationshipIfOneExcluded
+                        && (!leftIsAudited || !rightIsAudited))
+                    {
+                        continue;
+                    }
+                    else if(!leftIsAudited && !rightIsAudited)
+                    {
+                        continue;
+                    }
+
                     // Relationship Added
                     if (objectStateEntry.State == EntityState.Added
                         && !audit.CurrentOrDefaultConfiguration.IgnoreRelationshipAdded)
diff --git a/src/shared/Z.EF.Plus.Audit.Shared/AuditConfiguration.cs b/src/shared/Z.EF.Plus.Audit.Shared/AuditConfiguration.cs
@@ -123,6 +123,12 @@ public AuditConfiguration()
         /// <value>A dictionary of value formatter for a property name.</value>
         public ConcurrentDictionary<string, Func<object, object>> ValueFormatterDictionary { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the exclude relationship if one excluded.
+        /// </summary>
+        /// <value>True if exclude relationship if one excluded, false if not.</value>
+        public bool ExcludeRelationshipIfOneExcluded { get; set; }
+
 #if EF5 || EF6
         /// <summary>
         ///     Gets or sets a value indicating whether null value should be used in the Audit instead of DBNull.Value
@@ -156,6 +162,7 @@ public AuditConfiguration Clone()
                 ExcludeIncludePropertyPredicates = new List<Func<object, string, bool?>>(ExcludeIncludePropertyPredicates),
                 SoftAddedPredicates = new List<Func<object, bool>>(SoftAddedPredicates),
                 SoftDeletedPredicates = new List<Func<object, bool>>(SoftDeletedPredicates),
+                ExcludeRelationshipIfOneExcluded = ExcludeRelationshipIfOneExcluded,
 #if EF5 || EF6
                 UseNullForDBNullValue = UseNullForDBNullValue
 #endif
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
@@ -14,11 +14,13 @@
 using System.Text.RegularExpressions;
 #if EF5
 using System.Data.Objects;
+using System.Data.SqlClient;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
 
 #elif EF6
 using System.Data.Entity.Core.Objects;
 using System.Data.Entity.Infrastructure.Interception;
+using System.Data.SqlClient;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
 
 #elif EFCORE
@@ -473,6 +475,15 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
                 var parameter = command.CreateParameter();
                 parameter.ParameterName = parameterPrefix + "zzz_BatchUpdate_" + i;
                 parameter.Value = values[i].Item2 ?? DBNull.Value;
+
+                if(parameter is SqlParameter)
+                {
+                    var sqlParameter = (SqlParameter)parameter;
+                    if(sqlParameter.DbType == DbType.DateTime)
+                    {
+                        sqlParameter.DbType = DbType.DateTime2;
+                    }
+                }
                 command.Parameters.Add(parameter);
             }
 
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF/DbParameter/DbParameter.CopyFrom.cs b/src/shared/Z.EF.Plus._Core.Shared/EF/DbParameter/DbParameter.CopyFrom.cs
@@ -9,9 +9,11 @@
 
 using System;
 using System.Data.Common;
+using System.Reflection;
 
 #if EF5
 using System.Data.Objects;
+#elif EF6
 #elif EFCORE
 using Microsoft.EntityFrameworkCore.Storage;
 #endif
@@ -22,23 +24,49 @@ internal static partial class InternalExtensions
     {
         public static void CopyFrom(this DbParameter @this, DbParameter from)
         {
+#if NETSTANDARD
+            var fullName = @this.GetType().GetTypeInfo().FullName;
+#else
+            var fullName = @this.GetType().FullName;
+#endif
             @this.DbType = from.DbType;
             @this.Direction = from.Direction;
             @this.IsNullable = from.IsNullable;
             @this.ParameterName = from.ParameterName;
             @this.Size = from.Size;
 
+#if EF6
+            if(fullName.Contains("Oracle") && from.GetType().GetProperty("OracleDbType") != null)
+            {
+                  var property = from.GetType().GetProperty("OracleDbType");
+                  property.SetValue(@this, property.GetValue(from, null), new object[0]);
+            }
+#endif
+
             @this.Value = from.Value ?? DBNull.Value;
         }
 
         public static void CopyFrom(this DbParameter @this, DbParameter from, string newParameterName)
         {
+#if NETSTANDARD
+            var fullName = @this.GetType().GetTypeInfo().FullName;
+#else
+            var fullName = @this.GetType().FullName;
+#endif
             @this.DbType = from.DbType;
             @this.Direction = from.Direction;
             @this.IsNullable = from.IsNullable;
             @this.ParameterName = newParameterName;
             @this.Size = from.Size;
 
+#if EF6
+            if (fullName.Contains("Oracle") && from.GetType().GetProperty("OracleDbType") != null)
+            {
+                var property = from.GetType().GetProperty("OracleDbType");
+                property.SetValue(@this, property.GetValue(from, null), new object[0]);
+            }
+#endif
+
             @this.Value = from.Value ?? DBNull.Value;
         }
 
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EFCore/IQueryable`/GetInMemoryContext.cs b/src/shared/Z.EF.Plus._Core.Shared/EFCore/IQueryable`/GetInMemoryContext.cs
@@ -27,6 +27,19 @@ public static DbContext GetInMemoryContext<T>(this IQueryable<T> source)
             var queryContextFactory = queryContextFactoryField.GetValue(compiler);
 
 #if EFCORE
+#if NETSTANDARD2_0
+            var dependenciesProperty = typeof(QueryContextFactory).GetProperty("Dependencies", BindingFlags.NonPublic | BindingFlags.Instance);
+            var dependencies = dependenciesProperty.GetValue(queryContextFactory);
+
+            var stateManagerField = dependencies.GetType().GetProperty("StateManager", BindingFlags.Public | BindingFlags.Instance);
+            var stateManagerDynamic = stateManagerField.GetValue(dependencies);
+
+            IStateManager stateManager = stateManagerDynamic as IStateManager;
+            if (stateManager == null)
+            {
+                stateManager = ((dynamic)stateManagerDynamic).Value;
+            }
+#else
             var stateManagerField = typeof(QueryContextFactory).GetProperty("StateManager", BindingFlags.NonPublic | BindingFlags.Instance);
             var stateManagerDynamic = stateManagerField.GetValue(queryContextFactory);
 
@@ -35,6 +48,7 @@ public static DbContext GetInMemoryContext<T>(this IQueryable<T> source)
             {
                 stateManager = ((dynamic) stateManagerDynamic).Value;
             }
+#endif
 #else
             var stateManagerField = typeof (QueryContextFactory).GetField("_stateManager", BindingFlags.NonPublic | BindingFlags.Instance);
             var stateManager = (IStateManager) stateManagerField.GetValue(queryContextFactory);

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static void AuditRelationAdded(Audit audit, EntityEntry objectStateEntry)`
`52`	`52`	`#endif`
`53`	`53`	`{`
`54`	`54`	`var values = objectStateEntry.CurrentValues;`
`55`		`-`
	`55`	`+`
`56`	`56`	`var leftKeys = (EntityKey) values.GetValue(0);`
`57`	`57`	`var rightKeys = (EntityKey) values.GetValue(1);`
`58`	`58`