Merge pull request #227 from naldorp/EffortInMemoryFix

Implemented in memory check for Effort in EF6

Author: JonathanMagnan

src/Z.EntityFramework.Plus.EF6/Z.EntityFramework.Plus.EF6.csproj

@@ -45,6 +45,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Runtime.Extensions" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

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

@@ -185,7 +185,19 @@ public int Execute<T>(IQueryable<T> query) where T : class
             {
                 return 0;
             }
-         
+
+#if EF6
+            if (query.IsInMemoryEffortQueryContext())
+            {
+                var context = query.GetDbContext();
+
+                var list = query.ToList();
+                context.Set<T>().RemoveRange(list);
+                context.SaveChanges();
+                return list.Count;
+            }
+#endif
+
             // GET model and info
 #if EF5 || EF6
             var dbContext = query.GetDbContext();

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

@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
+using System.Reflection;
 #if EF5
 using System.Data.Objects;
 using System.Data.SqlClient;
@@ -184,8 +185,37 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
             {
                 return 0;
             }
+#if EF6
+            if (query.IsInMemoryEffortQueryContext())
+            {
+                var context = query.GetDbContext();
+
+                var list = query.ToList();
+                var compiled = updateFactory.Compile();
+                var memberBindings = ((MemberInitExpression)updateFactory.Body).Bindings;
+                var accessors = memberBindings
+                    .Select(x => x.Member.Name)
+                    .Select(x => new PropertyOrFieldAccessor(typeof(T).GetProperty(x, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)))
+                    .ToList();
+
+                foreach (var item in list)
+                {
+                    var newItem = compiled(item);
+
+                    foreach (var accessor in accessors)
+                    {
+                        var value = accessor.GetValue(newItem);
+                        accessor.SetValue(item, value);
+                    }
+                }
+
+                context.SaveChanges();
+                return list.Count;
+            }
+#endif
 
 #if EF5 || EF6
+
             var objectQuery = query.GetObjectQuery();
 
             // GET model and info
@@ -242,6 +272,7 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
                     innerObjectQuery.Context.Connection.Close();
                 }
             }
+
 #elif EFCORE
             if (BatchUpdateManager.InMemoryDbContextFactory != null && query.IsInMemoryQueryContext())
             {
@@ -312,7 +343,7 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
                 }
             }
 #endif
-            }
+        }
 
 #if EF5 || EF6
         /// <summary>Creates a command to execute the batch operation.</summary>

src/shared/Z.EF.Plus._Core.Shared/EF6/IQueryable`/IsInMemoryEffortQueryContext.cs

@@ -0,0 +1,19 @@
+
+#if EF6
+using System;
+using System.Data.Entity;
+using System.Linq;
+using System.Reflection;
+
+namespace Z.EntityFramework.Plus
+{
+    internal static partial class InternalExtensions
+    {
+        public static bool IsInMemoryEffortQueryContext<T>(this IQueryable<T> q)
+        {
+            return q.GetDbContext().Database.Connection.GetType().FullName == "Effort.Provider.EffortConnection";
+        }
+    }
+}
+
+#endif

src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems

@@ -38,6 +38,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)EF5_EF6\ObjectContext\CreateStoreCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF5_EF6\ObjectContext\GetEntitySet.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF5_EF6\Object\Object.GetObjectQuery.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EF6\IQueryable`\IsInMemoryEffortQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetDbContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetInterceptionContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectQuery\GetCommandTextAndParameters.cs" />