Update to v1.5.3

Fix GetCommandTextAndParameters

Author: zzzprojects

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

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ac398eb8-0a31-4d06-a804-84d10b6da96d")]
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyFileVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.3")]
+[assembly: AssemblyFileVersion("1.5.3")]

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/EF5_EF6/DbContext/DbContext.GetObjectContext.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || QUERY_FILTER
+#if FULL || BATCH_DELETE || BATCH_UPDATE || QUERY_FILTER
 #if EF5 || EF6
 
 #if EF5

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/EF6/ObjectQuery/GetCommandTextAndParameters.cs

@@ -42,12 +42,21 @@ public static Tuple<string, DbParameterCollection> GetCommandTextAndParameters(t
                 var interceptorsField = commandDispatcher.GetType().GetField("_interceptors", BindingFlags.Instance | BindingFlags.NonPublic);
                 var interceptors = (List<IDbCommandInterceptor>) interceptorsField.GetValue(commandDispatcher);
 
-                interceptors.ForEach(i => i.ReaderExecuting(prepareEntityCommandBeforeExecution, new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext())));
+                var interceptionContexts = new Dictionary<IDbCommandInterceptor, DbCommandInterceptionContext<DbDataReader>>();
+
+                interceptors.ForEach(i => {
+                    var interceptionContext = new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext());
+                    interceptionContexts[i] = interceptionContext;
+                    i.ReaderExecuting(prepareEntityCommandBeforeExecution, interceptionContext);
+                });
 
                 sql = prepareEntityCommandBeforeExecution.CommandText;
                 var parameters = prepareEntityCommandBeforeExecution.Parameters;
 
-                interceptors.ForEach(i => i.ReaderExecuted(prepareEntityCommandBeforeExecution, new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext())));
+                interceptors.ForEach(i => {
+                    var interceptionContext = interceptionContexts[i];
+                    i.ReaderExecuted(prepareEntityCommandBeforeExecution, interceptionContext);
+                });
 
                 return new Tuple<string, DbParameterCollection>(sql, parameters);
             }

src/Z.EntityFramework.Plus.EF6/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("89f47e22-ff83-4ac8-be90-c6755748cf89")]
-[assembly: AssemblyVersion("1.5.2")]
-[assembly: AssemblyFileVersion("1.5.2")]
+[assembly: AssemblyVersion("1.5.3")]
+[assembly: AssemblyFileVersion("1.5.3")]

src/Z.EntityFramework.Plus.EF6/_Internal/EF6/ObjectQuery/GetCommandTextAndParameters.cs

@@ -42,12 +42,21 @@ public static Tuple<string, DbParameterCollection> GetCommandTextAndParameters(t
                 var interceptorsField = commandDispatcher.GetType().GetField("_interceptors", BindingFlags.Instance | BindingFlags.NonPublic);
                 var interceptors = (List<IDbCommandInterceptor>) interceptorsField.GetValue(commandDispatcher);
 
-                interceptors.ForEach(i => i.ReaderExecuting(prepareEntityCommandBeforeExecution, new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext())));
+                var interceptionContexts = new Dictionary<IDbCommandInterceptor, DbCommandInterceptionContext<DbDataReader>>();
+
+                interceptors.ForEach(i => {
+                    var interceptionContext = new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext());
+                    interceptionContexts[i] = interceptionContext;
+                    i.ReaderExecuting(prepareEntityCommandBeforeExecution, interceptionContext);
+                });
 
                 sql = prepareEntityCommandBeforeExecution.CommandText;
                 var parameters = prepareEntityCommandBeforeExecution.Parameters;
 
-                interceptors.ForEach(i => i.ReaderExecuted(prepareEntityCommandBeforeExecution, new DbCommandInterceptionContext<DbDataReader>(objectQuery.Context.GetInterceptionContext())));
+                interceptors.ForEach(i => {
+                    var interceptionContext = interceptionContexts[i];
+                    i.ReaderExecuted(prepareEntityCommandBeforeExecution, interceptionContext);
+                });
 
                 return new Tuple<string, DbParameterCollection>(sql, parameters);
             }

version.txt

@@ -1 +1 @@
-v1.5.2
+v1.5.3