Fix: Use InterceptionContext for EF6 for BatchDelete && BatchUpdate

Fix: Use InterceptionContext for EF6 for BatchDelete && BatchUpdate

Author: zzzprojects

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

@@ -20,6 +20,7 @@
 
 #elif EF6
 using System.Data.Entity.Core.Objects;
+using System.Data.Entity.Infrastructure.Interception;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
 
 #elif EFCORE
@@ -173,7 +174,8 @@ public int Execute<T>(IQueryable<T> query) where T : class
 
             // GET model and info
 #if EF5 || EF6
-            var model = query.GetDbContext().GetModel();
+            var dbContext = query.GetDbContext();
+            var model = dbContext.GetModel();
             var entity = model.Entity<T>();
             var keys = entity.Info.Key.PropertyRefs;
 
@@ -206,6 +208,7 @@ public int Execute<T>(IQueryable<T> query) where T : class
                     Executing(command);
                 }
 
+#if EF5
                 if (command.GetType().Name == "NpgsqlCommand")
                 {
                     command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
@@ -232,6 +235,36 @@ public int Execute<T>(IQueryable<T> query) where T : class
                     var rowAffecteds = (int)command.ExecuteScalar();
                     return rowAffecteds;
                 }
+#elif EF6
+                var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
+
+                if (command.GetType().Name == "NpgsqlCommand")
+                {
+                    command.CommandText = command.CommandText.Replace("[", "\"").Replace("]", "\"");
+                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+                    return totalRowAffecteds;
+                }
+                else if (command.Connection.GetType().Name.Contains("MySql"))
+                {
+                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+                    return totalRowAffecteds;
+                }
+                else if (command.Connection.GetType().Name.Contains("Oracle"))
+                {
+                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+                    return totalRowAffecteds;
+                }
+                else if (command.GetType().Name == "SqlCeCommand")
+                {
+                    int totalRowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+                    return totalRowAffecteds;
+                }
+                else
+                {
+                    var rowAffecteds = (int)DbInterception.Dispatch.Command.Scalar(command, interceptionContext);
+                    return rowAffecteds;
+                }
+#endif
 
             }
             finally
@@ -300,7 +333,7 @@ public int Execute<T>(IQueryable<T> query) where T : class
                 }
             }
 #endif
-        }
+            }
 
 #if EF5 || EF6
         /// <summary>Creates a command to execute the batch operation.</summary>

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

@@ -18,6 +18,7 @@
 
 #elif EF6
 using System.Data.Entity.Core.Objects;
+using System.Data.Entity.Infrastructure.Interception;
 using Z.EntityFramework.Plus.Internal.Core.SchemaObjectModel;
 
 #elif EFCORE
@@ -172,7 +173,8 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
             var objectQuery = query.GetObjectQuery();
 
             // GET model and info
-            var model = query.GetDbContext().GetModel();
+            var dbContext = query.GetDbContext();
+            var model = dbContext.GetModel();
             var entity = model.Entity<T>();
 
             // TODO: Select only key + lambda columns
@@ -209,7 +211,12 @@ public int Execute<T>(IQueryable<T> query, Expression<Func<T, T>> updateFactory)
                     Executing(command);
                 }
 
+#if EF5
                 var rowAffecteds = command.ExecuteNonQuery();
+#elif EF6
+                var interceptionContext = new DbCommandInterceptionContext(dbContext.GetObjectContext().GetInterceptionContext());
+                var rowAffecteds = DbInterception.Dispatch.Command.NonQuery(command, interceptionContext);
+#endif
                 return rowAffecteds;
             }
             finally
@@ -289,7 +296,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>

version.txt

@@ -1 +1 @@
-v1.6.8
+v1.6.9