Fix BatchUpdate, BatchDelete Issue with Database First

Fix BatchUpdate, BatchDelete Issue with Database First

Author: zzzprojects

src/Z.EntityFramework.Plus.EF5.NET40/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.4")]
+[assembly: AssemblyFileVersion("1.2.4")]

src/Z.EntityFramework.Plus.EF5.NET40/Z.EntityFramework.Plus.EF5.NET40.csproj

@@ -146,6 +146,7 @@
     <Compile Include="_Internal\EF5\DbContext.SaveChangesAsync.cs" />
     <Compile Include="_Internal\EF5\IDbSet`\DbContext.AddRange.cs" />
     <Compile Include="_Internal\EF5\IDbSet`\DbContext.RemoveRange.cs" />
+    <Compile Include="_Internal\EF5_EF6\Database\GetEntityConnection.cs" />
     <Compile Include="_Internal\EF5_EF6\DbContext\DbContext.GetObjectContext.cs" />
     <Compile Include="_Internal\EF5_EF6\EntityConnection\GetDbTransaction.cs" />
     <Compile Include="_Internal\EF5_EF6\EntityConnection\GetEntityTransaction.cs" />

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/DynamicAnonymousType/DynamicAnonymousType.cs

@@ -20,7 +20,7 @@ internal static class DynamicAnonymousType
     {
 
         private static readonly AssemblyName AssemblyName = new AssemblyName { Name = "<>f__AnonymousType" };
-#if NETCORE50
+#if NETSTANDARD1_3
         private static readonly ModuleBuilder ModuleBuilder = System.Reflection.Emit.AssemblyBuilder.DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
 #else
         private static readonly ModuleBuilder ModuleBuilder = Thread.GetDomain().DefineDynamicAssembly(AssemblyName, AssemblyBuilderAccess.Run).DefineDynamicModule(AssemblyName.Name);
@@ -112,7 +112,7 @@ public static Type GetDynamicType(List<Tuple<string, Type>> fields)
                 foreach (var field in fields)
                     typeBuilder.DefineField(field.Item1, field.Item2, FieldAttributes.Public);
 
-#if NETCORE50
+#if NETSTANDARD1_3
                 BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateTypeInfo().AsType());
 #else
                 BuiltTypes[typeKey] = new Tuple<string, Type>(typeName, typeBuilder.CreateType());

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF/DbContext/DbContext.GetDbSetProperties.cs

@@ -36,7 +36,7 @@ internal static List<PropertyInfo> GetDbSetProperties(this DbContext context)
 #if EF5 || EF6
                 var isDbSet = setType.IsGenericType && (typeof (IDbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()) || setType.GetInterface(typeof (IDbSet<>).FullName) != null);
 #elif EFCORE
-#if NETCORE50
+#if NETSTANDARD1_3
                 var isDbSet = setType.GetType().IsConstructedGenericType && (typeof (DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));
 #else
                 var isDbSet = setType.IsGenericType && (typeof(DbSet<>).IsAssignableFrom(setType.GetGenericTypeDefinition()));

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF/IQueryable`/IQueryable.Order.cs

@@ -8,7 +8,7 @@
 #if FULL
 using System.Linq;
 using System.Linq.Expressions;
-#if NETCORE50
+#if NETSTANDARD1_3
 using System.Reflection;
 #endif
 namespace Z.EntityFramework.Plus

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF/Type/Type.GetDbSetElementType.cs

@@ -44,7 +44,7 @@ public static Type GetDbSetElementType(this Type type)
             return null;
 #elif EFCORE
 
-#if NETCORE50
+#if NETSTANDARD1_3
             return type.GetTypeInfo().GenericTypeArguments[0];
 #else
             return type.GetGenericArguments()[0];

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF5_EF6/Database/GetEntityConnection.cs

@@ -0,0 +1,46 @@
+// Description: Entity Framework Bulk Operations & Utilities (EF Bulk SaveChanges, Insert, Update, Delete, Merge | LINQ Query Cache, Deferred, Filter, IncludeFilter, IncludeOptimize | Audit)
+// Website & Documentation: https://github.com/zzzprojects/Entity-Framework-Plus
+// Forum & Issues: https://github.com/zzzprojects/EntityFramework-Plus/issues
+// License: https://github.com/zzzprojects/EntityFramework-Plus/blob/master/LICENSE
+// More projects: http://www.zzzprojects.com/
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+
+#if FULL || BATCHDELETE || BATCHUPDATE
+#if EF5 || EF6
+
+#if EF5
+using System.Data.Common;
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.Data.EntityClient;
+using System.Data.Objects;
+using System.Reflection;
+
+#elif EF6
+using System.Data.Common;
+using System.Data.Entity;
+using System.Data.Entity.Core.EntityClient;
+using System.Data.Entity.Core.Objects;
+using System.Reflection;
+
+#endif
+
+namespace Z.EntityFramework.Plus
+{
+    internal static partial class InternalExtensions
+    {
+        public static EntityConnection GetEntityConnection(this Database @this)
+        {
+            object internalContext = @this.GetType().GetField("_internalContext", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(@this);
+
+            MethodInfo getObjectContext = internalContext.GetType().GetMethod("GetObjectContextWithoutDatabaseInitialization", BindingFlags.Public | BindingFlags.Instance);
+            var objectContext = (ObjectContext)getObjectContext.Invoke(internalContext, null);
+            DbConnection entityConnection = objectContext.Connection;
+
+            return (EntityConnection)entityConnection;
+        }
+    }
+}
+
+#endif
+#endif

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EF5_EF6/IQueryable/IQueryable.SelectByName.cs

@@ -11,7 +11,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-#if NETCORE50
+#if NETSTANDARD1_3
 using System.Reflection;
 #endif
 

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/EFCore/CreateEntity/CreateEntityDataReader.cs

@@ -57,7 +57,7 @@ public override int RecordsAffected
             get { return OriginalDataReader.RecordsAffected; }
         }
 
-        //#if !NETCORE50
+        //#if !NETSTANDARD1_3
         //        public override void Close()
         //        {
         //            // DO NOT close reader

src/Z.EntityFramework.Plus.EF5.NET40/_Internal/Model/Model/Model.GetModelName.cs

@@ -20,7 +20,7 @@ internal static partial class Model
         /// <returns>The model name.</returns>
         internal static string GetModelName(this DbContext @this)
         {
-            var connectionString = @this.Database.Connection.ConnectionString;
+            var connectionString = @this.Database.GetEntityConnection().ConnectionString;
             var end = connectionString.IndexOf(".msl") - 1;
 
             if (end <= -1)