Fix

Fix

Author: zzzprojects

src/shared/Z.EF.Plus.Audit.Shared/AuditEntryState.cs

@@ -29,6 +29,9 @@ public enum AuditEntryState
         RelationshipAdded,
 
         /// <summary>An enum constant representing the relationship deleted option.</summary>
-        RelationshipDeleted
+        RelationshipDeleted,
+
+        /// <summary>An enum constant representing the entity current option.</summary>
+        EntityCurrent
     }
 }

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

@@ -380,6 +380,7 @@ 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 isSqlCe = command.GetType().Name == "SqlCeCommand";
             var isOracle = command.GetType().Namespace.Contains("Oracle");
@@ -441,7 +442,7 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
             }
 
             // GET command text template
-            var commandTextTemplate = command.GetType().Name == "NpgsqlCommand" ?
+            var commandTextTemplate = isPostgreSql ?
                 CommandTextPostgreSQLTemplate :
                 isOracle ?
                     CommandTextOracleTemplate :
@@ -465,6 +466,11 @@ internal DbCommand CreateCommand<T>(ObjectQuery query, SchemaEntityType<T> entit
                 return null;
             }
 
+            if (isPostgreSql && customQuery.Item1.EndsWith("WHERE TRUE = FALSE", StringComparison.InvariantCultureIgnoreCase))
+            {
+                return null;
+            }
+
             var querySelect = customQuery.Item1;
 
             // GET primary key join

src/shared/Z.EF.Plus.QueryFilterInterceptor.Shared/QueryFilterInterceptorDbCommandTree.cs

@@ -1,13 +1,16 @@
 using System;
 using System.Data.Entity.Core.Common.CommandTrees;
+using System.Data.Entity.Core.Metadata.Edm;
 using System.Data.Entity.Infrastructure.Interception;
 using System.Linq;
+using System.Reflection;
 
 namespace Z.EntityFramework.Plus
 {
     /// <summary>A query interceptor filter database command tree.</summary>
     public class QueryFilterInterceptorDbCommandTree : IDbCommandTreeInterceptor
     {
+        public static ConstructorInfo DbQueryCommandTreeConstructor = typeof(DbQueryCommandTree).GetConstructor(new Type[] { typeof(MetadataWorkspace), typeof(DataSpace), typeof(DbExpression), typeof(bool), typeof(bool) });
         /// <summary>
         ///     This method is called after a new
         ///     <see cref="T:System.Data.Entity.Core.Common.CommandTrees.DbCommandTree" /> has been created.
@@ -80,9 +83,19 @@ public void TreeCreated(DbCommandTreeInterceptionContext interceptionContext)
                     };
 
                     var newQuery = queryFiltered.Accept(visitor);
-               
+
                     // CREATE a new Query
-                    var commandTree = new DbQueryCommandTree(dbQueryCommandTree.MetadataWorkspace, dbQueryCommandTree.DataSpace, newQuery, true);
+                    DbQueryCommandTree commandTree;
+                    if (DbQueryCommandTreeConstructor != null)
+                    {
+                        commandTree = (DbQueryCommandTree)DbQueryCommandTreeConstructor.Invoke(new object[] { dbQueryCommandTree.MetadataWorkspace, dbQueryCommandTree.DataSpace, newQuery, true, interceptionContext.OriginalResult.DataSpace != DataSpace.CSpace });
+                    }
+                    else
+                    {
+                        commandTree = new DbQueryCommandTree(dbQueryCommandTree.MetadataWorkspace, dbQueryCommandTree.DataSpace, newQuery, true);
+
+                    }
+
                     interceptionContext.Result = commandTree;
                 }
             }

src/shared/Z.EF.Plus._Core.Shared/EFCore/GetStateManager.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL
+#if FULL || QUERY_FUTURE
 #if EFCORE
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.ChangeTracking;

version.txt

@@ -1 +1 @@
-v1.6.19
+v1.6.20