Fix Issue with MySQL && Parameter

Fix Issue with MySQL && Parameter

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.2.4")]
-[assembly: AssemblyFileVersion("1.2.4")]
+[assembly: AssemblyVersion("1.2.5")]
+[assembly: AssemblyFileVersion("1.2.5")]

src/Z.EntityFramework.Plus.EF6.NET40/QueryFuture/QueryFutureBatch.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Reflection;
 using System.Text;
 
 #if EF5
@@ -137,7 +138,7 @@ protected DbCommand CreateCommandCombined()
             foreach (var query in Queries)
             {
                 // GENERATE SQL
-#if EF5 || EF6
+#if EF5
                 var sql = query.Query.ToTraceString();
                 var parameters = query.Query.Parameters;
 
@@ -156,6 +157,47 @@ protected DbCommand CreateCommandCombined()
                     // REPLACE parameter with new value
                     sql = sql.Replace("@" + oldValue, "@" + newValue);
                 }
+#elif EF6
+
+                var objectQuery = query.Query;
+                var stateField = objectQuery.GetType().BaseType.GetField("_state", BindingFlags.NonPublic | BindingFlags.Instance);
+                var state = stateField.GetValue(objectQuery);
+                var getExecutionPlanMethod = state.GetType().GetMethod("GetExecutionPlan", BindingFlags.NonPublic | BindingFlags.Instance);
+                var getExecutionPlan = getExecutionPlanMethod.Invoke(state, new object[] { null });
+                var prepareEntityCommandMethod = getExecutionPlan.GetType().GetMethod("PrepareEntityCommand", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                string sql = "";
+                using (EntityCommand entityCommand = (EntityCommand) prepareEntityCommandMethod.Invoke(getExecutionPlan, new object[] {objectQuery.Context, objectQuery.Parameters}))
+                {
+                    var getCommandDefinitionMethod = entityCommand.GetType().GetMethod("GetCommandDefinition", BindingFlags.NonPublic | BindingFlags.Instance);
+                    var getCommandDefinition = getCommandDefinitionMethod.Invoke(entityCommand, new object[0]);
+
+                    var prepareEntityCommandBeforeExecutionMethod = getCommandDefinition.GetType().GetMethod("PrepareEntityCommandBeforeExecution", BindingFlags.NonPublic | BindingFlags.Instance);
+                    var prepareEntityCommandBeforeExecution = (DbCommand)prepareEntityCommandBeforeExecutionMethod.Invoke(getCommandDefinition, new object[] {entityCommand});
+
+                    sql = prepareEntityCommandBeforeExecution.CommandText;
+                    var parameters = prepareEntityCommandBeforeExecution.Parameters;
+
+                    // UPDATE parameter name
+                    foreach (DbParameter parameter in parameters)
+                    {
+                        var oldValue = parameter.ParameterName;
+                        if (oldValue.StartsWith("@"))
+                        {
+                            oldValue = oldValue.Substring(1);
+                        }
+                        var newValue = string.Concat("Z_", queryCount, "_", oldValue);
+
+                        // CREATE parameter
+                        var dbParameter = command.CreateParameter();
+                        dbParameter.ParameterName = newValue;
+                        dbParameter.Value = parameter.Value;
+                        command.Parameters.Add(dbParameter);
+
+                        // REPLACE parameter with new value
+                        sql = sql.Replace("@" + oldValue, "@" + newValue);
+                    }
+                }
 #elif EFCORE
 
                 RelationalQueryContext queryContext;

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.2.4")]
-[assembly: AssemblyFileVersion("1.2.4")]
+[assembly: AssemblyVersion("1.2.5")]
+[assembly: AssemblyFileVersion("1.2.5")]

src/Z.EntityFramework.Plus.EF6/QueryFuture/QueryFutureBatch.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Reflection;
 using System.Text;
 
 #if EF5
@@ -137,7 +138,7 @@ protected DbCommand CreateCommandCombined()
             foreach (var query in Queries)
             {
                 // GENERATE SQL
-#if EF5 || EF6
+#if EF5
                 var sql = query.Query.ToTraceString();
                 var parameters = query.Query.Parameters;
 
@@ -156,6 +157,47 @@ protected DbCommand CreateCommandCombined()
                     // REPLACE parameter with new value
                     sql = sql.Replace("@" + oldValue, "@" + newValue);
                 }
+#elif EF6
+
+                var objectQuery = query.Query;
+                var stateField = objectQuery.GetType().BaseType.GetField("_state", BindingFlags.NonPublic | BindingFlags.Instance);
+                var state = stateField.GetValue(objectQuery);
+                var getExecutionPlanMethod = state.GetType().GetMethod("GetExecutionPlan", BindingFlags.NonPublic | BindingFlags.Instance);
+                var getExecutionPlan = getExecutionPlanMethod.Invoke(state, new object[] { null });
+                var prepareEntityCommandMethod = getExecutionPlan.GetType().GetMethod("PrepareEntityCommand", BindingFlags.NonPublic | BindingFlags.Instance);
+
+                string sql = "";
+                using (EntityCommand entityCommand = (EntityCommand) prepareEntityCommandMethod.Invoke(getExecutionPlan, new object[] {objectQuery.Context, objectQuery.Parameters}))
+                {
+                    var getCommandDefinitionMethod = entityCommand.GetType().GetMethod("GetCommandDefinition", BindingFlags.NonPublic | BindingFlags.Instance);
+                    var getCommandDefinition = getCommandDefinitionMethod.Invoke(entityCommand, new object[0]);
+
+                    var prepareEntityCommandBeforeExecutionMethod = getCommandDefinition.GetType().GetMethod("PrepareEntityCommandBeforeExecution", BindingFlags.NonPublic | BindingFlags.Instance);
+                    var prepareEntityCommandBeforeExecution = (DbCommand)prepareEntityCommandBeforeExecutionMethod.Invoke(getCommandDefinition, new object[] {entityCommand});
+
+                    sql = prepareEntityCommandBeforeExecution.CommandText;
+                    var parameters = prepareEntityCommandBeforeExecution.Parameters;
+
+                    // UPDATE parameter name
+                    foreach (DbParameter parameter in parameters)
+                    {
+                        var oldValue = parameter.ParameterName;
+                        if (oldValue.StartsWith("@"))
+                        {
+                            oldValue = oldValue.Substring(1);
+                        }
+                        var newValue = string.Concat("Z_", queryCount, "_", oldValue);
+
+                        // CREATE parameter
+                        var dbParameter = command.CreateParameter();
+                        dbParameter.ParameterName = newValue;
+                        dbParameter.Value = parameter.Value;
+                        command.Parameters.Add(dbParameter);
+
+                        // REPLACE parameter with new value
+                        sql = sql.Replace("@" + oldValue, "@" + newValue);
+                    }
+                }
 #elif EFCORE
 
                 RelationalQueryContext queryContext;