Merge

Merge

Author: zzzprojects

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

@@ -186,8 +186,12 @@ public int Execute<T>(IQueryable<T> query) where T : class
                 return 0;
             }
 
+            // GET model and info
+#if EF5 || EF6
+            var dbContext = query.GetDbContext();
+
 #if EF6
-            if (query.IsInMemoryEffortQueryContext())
+            if (dbContext.IsInMemoryEffortQueryContext())
             {
                 var context = query.GetDbContext();
 
@@ -198,9 +202,6 @@ public int Execute<T>(IQueryable<T> query) where T : class
             }
 #endif
 
-            // GET model and info
-#if EF5 || EF6
-            var dbContext = query.GetDbContext();
             var model = dbContext.GetModel();
             var entity = model.Entity<T>();
             var keys = entity.Info.Key.PropertyRefs;

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

@@ -12,7 +12,6 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
-using System.Reflection;
 #if EF5
 using System.Data.Objects;
 using System.Data.SqlClient;
@@ -22,6 +21,7 @@
 using System.Data.Entity.Core.Objects;
 using System.Data.Entity.Infrastructure.Interception;
 using System.Data.SqlClient;
+using System.Reflection;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
 
 #elif EFCORE
@@ -185,8 +185,12 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
             {
                 return 0;
             }
+
+#if EF5 || EF6
+            var dbContext = query.GetDbContext();
+
 #if EF6
-            if (query.IsInMemoryEffortQueryContext())
+            if (dbContext.IsInMemoryEffortQueryContext())
             {
                 var context = query.GetDbContext();
 
@@ -214,12 +218,9 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
             }
 #endif
 
-#if EF5 || EF6
-
             var objectQuery = query.GetObjectQuery();
 
             // GET model and info
-            var dbContext = query.GetDbContext();
             var model = dbContext.GetModel();
             var entity = model.Entity<T>();
 
@@ -272,7 +273,6 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
                     innerObjectQuery.Context.Connection.Close();
                 }
             }
-
 #elif EFCORE
             if (BatchUpdateManager.InMemoryDbContextFactory != null && query.IsInMemoryQueryContext())
             {
@@ -343,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>
@@ -1159,7 +1159,7 @@ public Dictionary<string, object> ResolveUpdateFromQueryDictValues<T>(Expression
                         {
                             var lambda = Expression.Lambda(m, null);
                             var value = lambda.Compile().DynamicInvoke();
-                            var c =  Expression.Constant(value);
+                            var c = Expression.Constant(value, m.Type);
                             return c;
                         }
 

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

@@ -0,0 +1,17 @@
+#if FULL || BATCH_DELETE || BATCH_UPDATE
+#if EF6
+using System.Data.Entity;
+
+namespace Z.EntityFramework.Plus
+{
+    internal static partial class InternalExtensions
+    {
+        public static bool IsInMemoryEffortQueryContext(this DbContext @this)
+        {
+            return @this.Database.Connection.GetType().FullName == "Effort.Provider.EffortConnection";
+        }
+    }
+}
+
+#endif
+#endif

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

@@ -1,9 +1,6 @@
-
+#if FULL || BATCH_DELETE || BATCH_UPDATE
 #if EF6
-using System;
-using System.Data.Entity;
 using System.Linq;
-using System.Reflection;
 
 namespace Z.EntityFramework.Plus
 {
@@ -17,3 +14,4 @@ public static bool IsInMemoryEffortQueryContext<T>(this IQueryable<T> q)
 }
 
 #endif
+#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\DbContext\IsInMemoryEffortQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\IQueryable`\IsInMemoryEffortQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetDbContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetInterceptionContext.cs" />

version.txt

@@ -1 +1 @@
-v1.6.17
+v1.6.18