Fix MySQL Schema + Fix Cast + Fix Null Value + Fix Future and Effort

zzzprojects · zzzprojects · commit e5873d044d30 · 2017-11-06T21:25:15.000-05:00
diff --git a/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs b/src/shared/Z.EF.Plus.BatchDelete.Shared/BatchDelete.cs
@@ -380,8 +380,8 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
             // GET command
             var command = query.Context.CreateStoreCommand();
 
-            bool isPostgreSql = command.GetType().Name == "NpgsqlCommand";
-            bool isMySql = command.GetType().FullName.Contains("MySql");
+            var isPostgreSql = command.GetType().Name == "NpgsqlCommand";
+            var isMySql = command.GetType().FullName.Contains("MySql");
             var isSqlCe = command.GetType().Name == "SqlCeCommand";
             var isOracle = command.GetType().Namespace.Contains("Oracle");
             var isSQLite = command.GetType().Namespace.Contains("SQLite");
@@ -404,7 +404,9 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
 
             if (isMySql)
             {
-                tableName = string.Concat("`", store.Table, "`");
+                tableName = string.IsNullOrEmpty(store.Schema) || store.Schema == "dbo" ?
+                    string.Concat("`", store.Table, "`") :
+                    string.Concat("`", store.Schema, ".", store.Table, "`");
             }
             else if (isSqlCe)
             {
@@ -420,6 +422,12 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
 string.Concat("\"", store.Table, "\"") :
 string.Concat("\"", store.Schema, "\".\"", store.Table, "\"");
             }
+            else if (isPostgreSql)
+            {
+                tableName = string.IsNullOrEmpty(store.Schema) ?
+                    string.Concat("\"", store.Table, "\"") :
+                    string.Concat("\"", store.Schema, "\".\"", store.Table, "\"");
+            }
             else
             {
                 tableName = string.IsNullOrEmpty(store.Schema) ?
diff --git a/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs b/src/shared/Z.EF.Plus.BatchUpdate.Shared/BatchUpdate.cs
@@ -39,6 +39,11 @@ namespace Z.EntityFramework.Plus
     /// <summary>Class to batch delete.</summary>
     public class BatchUpdate
     {
+        public class NullValue
+        {
+            public Type Type;
+        }
+
         /// <summary>The command text template.</summary>
         internal const string CommandTextTemplate = @"
 UPDATE A {Hint}
@@ -380,7 +385,9 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
 
             if (isMySql)
             {
-                tableName = string.Concat("`", store.Table, "`");
+                tableName = string.IsNullOrEmpty(store.Schema) || store.Schema == "dbo" ?
+                    string.Concat("`", store.Table, "`") :
+                    string.Concat("`", store.Schema, ".", store.Table, "`");
             }
             else if (isSqlCe)
             {
@@ -533,12 +540,28 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
 
                 var parameter = command.CreateParameter();
                 parameter.ParameterName = parameterPrefix + "zzz_BatchUpdate_" + i;
-                parameter.Value = values[i].Item2 ?? DBNull.Value;
+
+                var paramValue = values[i].Item2;
+                var paramNullValue = paramValue as NullValue;
+                if (paramNullValue != null)
+                {
+                    parameter.Value = DBNull.Value;
+                }
+                else
+                {
+                    parameter.Value = paramValue ?? DBNull.Value;
+                }
+                
 
                 if (parameter is SqlParameter)
                 {
                     var sqlParameter = (SqlParameter)parameter;
-                    if (sqlParameter.DbType == DbType.DateTime)
+             
+                    if (paramNullValue != null && paramNullValue.Type == typeof(byte[]))
+                    {
+                        sqlParameter.SqlDbType = SqlDbType.VarBinary;
+                    }
+                    else if (sqlParameter.DbType == DbType.DateTime)
                     {
                         sqlParameter.DbType = DbType.DateTime2;
                     }
@@ -816,7 +839,18 @@ public DbCommand CreateCommand(IQueryable query, IEntityType entity, List<Tuple<
 
                 var parameter = command.CreateParameter();
                 parameter.ParameterName = "@zzz_BatchUpdate_" + i;
-                parameter.Value = values[i].Item2 ?? DBNull.Value;
+
+                var paramValue = values[i].Item2;
+                var paramNullValue = paramValue as NullValue;
+                if (paramNullValue != null)
+                {
+                    parameter.Value = DBNull.Value;
+                }
+                else
+                {
+                    parameter.Value = paramValue ?? DBNull.Value;
+                }
+
                 command.Parameters.Add(parameter);
             }
 
@@ -1101,6 +1135,11 @@ public Dictionary<string, object> ResolveUpdateFromQueryDictValues<T>(Expression
         {
             var dictValues = new Dictionary<string, object>();
             var updateExpressionBody = updateFactory.Body;
+
+            while (updateExpressionBody.NodeType == ExpressionType.Convert || updateExpressionBody.NodeType == ExpressionType.ConvertChecked)
+            {
+                updateExpressionBody = ((UnaryExpression)updateExpressionBody).Operand;
+            }
             var entityType = typeof(T);
 
             // ENSURE: new T() { MemberInitExpression }
@@ -1142,7 +1181,15 @@ public Dictionary<string, object> ResolveUpdateFromQueryDictValues<T>(Expression
 
                     if (constantExpression != null)
                     {
-                        value = constantExpression.Value;
+                        if (constantExpression.Value == null)
+                        {
+                            value = new NullValue() {Type = constantExpression.Type};
+                        }
+                        else
+                        {
+                            value = constantExpression.Value;
+                        }
+                        
                     }
                     else
                     {
diff --git a/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs b/src/shared/Z.EF.Plus.QueryFuture.Shared/QueryFutureBatch.cs
@@ -106,6 +106,19 @@ public void ExecuteQueries()
 
 #if EF5 || EF6
             var connection = (EntityConnection)Context.Connection;
+
+#if EF6
+            if (Context.IsInMemoryEffortQueryContext())
+            {
+                foreach (var query in Queries)
+                {
+                    query.GetResultDirectly();
+                }
+
+                Queries.Clear();
+                return;
+            }
+#endif
 #elif EFCORE
             if (IsInMemory)
             {
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF6/DbContext/IsInMemoryEffortQueryContext.cs b/src/shared/Z.EF.Plus._Core.Shared/EF6/DbContext/IsInMemoryEffortQueryContext.cs
@@ -1,4 +1,4 @@
-﻿#if FULL || BATCH_DELETE || BATCH_UPDATE
+﻿#if FULL || BATCH_DELETE || BATCH_UPDATE || QUERY_FUTURE || QUERY_INCLUDEOPTIMIZED
 #if EF6
 using System.Data.Entity;
 
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF6/ObjectContext/GetDbContext.cs b/src/shared/Z.EF.Plus._Core.Shared/EF6/ObjectContext/GetDbContext.cs
@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || AUDIT || BATCH_DELETE || BATCH_UPDATE || QUERY_FILTER
+#if FULL || AUDIT || BATCH_DELETE || BATCH_UPDATE || QUERY_FILTER || QUERY_FUTURE || QUERY_INCLUDEOPTIMIZED
 #if EF6
 using System.Data.Entity;
 using System.Data.Entity.Core.Objects;
diff --git a/src/shared/Z.EF.Plus._Core.Shared/EF6/ObjectContext/IsInMemoryEffortQueryContext.cs b/src/shared/Z.EF.Plus._Core.Shared/EF6/ObjectContext/IsInMemoryEffortQueryContext.cs
@@ -0,0 +1,18 @@
+﻿#if FULL || BATCH_DELETE || BATCH_UPDATE || QUERY_FUTURE || QUERY_INCLUDEOPTIMIZED
+#if EF6
+using System.Data.Entity;
+using System.Data.Entity.Core.Objects;
+
+namespace Z.EntityFramework.Plus
+{
+    internal static partial class InternalExtensions
+    {
+        public static bool IsInMemoryEffortQueryContext(this ObjectContext @this)
+        {
+            return @this.GetDbContext().IsInMemoryEffortQueryContext();
+        }
+    }
+}
+
+#endif
+#endif
diff --git a/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems b/src/shared/Z.EF.Plus._Core.Shared/Z.EF.Plus._Core.Shared.projitems
@@ -42,6 +42,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)EF6\IQueryable`\IsInMemoryEffortQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetDbContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\GetInterceptionContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectContext\IsInMemoryEffortQueryContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EF6\ObjectQuery\GetCommandTextAndParameters.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\CreateEntity\CreateEntityCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)EFCore\CreateEntity\CreateEntityConnection.cs" />
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.7.5
+v1.7.6

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if FULL \|\| BATCH_DELETE \|\| BATCH_UPDATE`
	`1`	`+#if FULL \|\| BATCH_DELETE \|\| BATCH_UPDATE \|\| QUERY_FUTURE \|\| QUERY_INCLUDEOPTIMIZED`
`2`	`2`	`#if EF6`
`3`	`3`	`using System.Data.Entity;`
`4`	`4`