Fix QueryFutre + QueryCache + QueryFilter

Fix QueryFutre + QueryCache + QueryFilter

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.4.14")]
-[assembly: AssemblyFileVersion("1.4.14")]
+[assembly: AssemblyVersion("1.4.16")]
+[assembly: AssemblyFileVersion("1.4.16")]

src/Z.EntityFramework.Plus.EF6.NET40/QueryCache/Extensions/IQueryable`/FromCacheAsync.cs

@@ -58,6 +58,23 @@ public static Task<IEnumerable<T>> FromCacheAsync<T>(this IQueryable<T> query, C
             return result;
         }
 
+        //public static async Task<IEnumerable<T>> FromCacheAsync2<T>(this IQueryable<T> query, CacheItemPolicy policy, params string[] tags) where T : class
+        //{
+        //    var key = QueryCacheManager.GetCacheKey(query, tags);
+
+        //    var item = QueryCacheManager.Cache.Get(key);
+
+        //    if (item == null)
+        //    {
+        //        item = await query.AsNoTracking().ToListAsync().ConfigureAwait(false);
+        //        item = QueryCacheManager.Cache.AddOrGetExisting(key, item, policy) ?? item;
+        //        QueryCacheManager.AddCacheTag(key, tags);
+        //    }
+
+        //    var result = (IEnumerable<T>)item;
+        //    return result;
+        //}
+
         /// <summary>
         ///     Return the result of the <paramref name="query" /> from the cache. If the query is not cached
         ///     yet, the query is materialized asynchronously and cached before being returned.

src/Z.EntityFramework.Plus.EF6.NET40/QueryFilter/Extensions/IDbSet.Filter.cs

@@ -36,9 +36,12 @@ public static IQueryable<T> Filter<T>(this DbSet<T> query, params object[] keys)
 #endif
         {
             var queryFilterQueryable = QueryFilterManager.GetFilterQueryable(query);
+            var nonQueryFilter = queryFilterQueryable != null ? (IQueryable<T>)queryFilterQueryable.OriginalQuery : query;
+
             var context = queryFilterQueryable != null ? queryFilterQueryable.Context : query.GetDbContext();
             var filterContext = QueryFilterManager.AddOrGetFilterContext(context);
-            return filterContext.ApplyFilter(query, keys);
+
+            return filterContext.ApplyFilter(nonQueryFilter, keys);
         }
     }
 }

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/LinqExpressionExtensions/LambdaExpression/LambdaExpression.GetPropertyOrFieldAccessor.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || AUDIT || QUERY_INCLUDEOPTIMIZED
+#if FULL || AUDIT || QUERY_INCLUDEFILTER || QUERY_INCLUDEOPTIMIZED
 
 using System;
 using System.Linq;

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/LinqExpressionExtensions/LambdaExpression/LambdaExpression.GetPropertyOrFieldAccessors.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || AUDIT || QUERY_INCLUDEOPTIMIZED
+#if FULL || AUDIT || QUERY_INCLUDEFILTER || QUERY_INCLUDEOPTIMIZED
 using System.Linq;
 using System.Linq.Expressions;
 

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/LinqExpressionExtensions/PropertyOrFieldAccessor.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || AUDIT || QUERY_INCLUDEOPTIMIZED
+#if FULL || AUDIT || QUERY_INCLUDEFILTER || QUERY_INCLUDEOPTIMIZED
 
 using System.Collections.ObjectModel;
 using System.Linq;

src/Z.EntityFramework.Plus.EF6.NET40/_Internal/LinqExpressionExtensions/_Internal/ExpressionExtensions.cs

@@ -5,7 +5,7 @@
 // More projects: http://www.zzzprojects.com/
 // Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 
-#if FULL || AUDIT || QUERY_INCLUDEOPTIMIZED
+#if FULL || AUDIT || QUERY_INCLUDEFILTER || QUERY_INCLUDEOPTIMIZED
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;

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.4.14")]
-[assembly: AssemblyFileVersion("1.4.14")]
+[assembly: AssemblyVersion("1.4.16")]
+[assembly: AssemblyFileVersion("1.4.16")]

src/Z.EntityFramework.Plus.EF6/QueryCache/Extensions/IQueryable`/FromCacheAsync.cs

@@ -58,6 +58,23 @@ public static Task<IEnumerable<T>> FromCacheAsync<T>(this IQueryable<T> query, C
             return result;
         }
 
+        //public static async Task<IEnumerable<T>> FromCacheAsync2<T>(this IQueryable<T> query, CacheItemPolicy policy, params string[] tags) where T : class
+        //{
+        //    var key = QueryCacheManager.GetCacheKey(query, tags);
+
+        //    var item = QueryCacheManager.Cache.Get(key);
+
+        //    if (item == null)
+        //    {
+        //        item = await query.AsNoTracking().ToListAsync().ConfigureAwait(false);
+        //        item = QueryCacheManager.Cache.AddOrGetExisting(key, item, policy) ?? item;
+        //        QueryCacheManager.AddCacheTag(key, tags);
+        //    }
+
+        //    var result = (IEnumerable<T>)item;
+        //    return result;
+        //}
+
         /// <summary>
         ///     Return the result of the <paramref name="query" /> from the cache. If the query is not cached
         ///     yet, the query is materialized asynchronously and cached before being returned.

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

@@ -158,45 +158,30 @@ protected DbCommand CreateCommandCombined()
                     sql = sql.Replace("@" + oldValue, "@" + newValue);
                 }
 #elif EF6
+                var commandTextAndParameter = query.Query.GetCommandTextAndParameters();
 
-                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;
+                var sql = commandTextAndParameter.Item1;
+                var parameters = commandTextAndParameter.Item2;
 
-                    // UPDATE parameter name
-                    foreach (DbParameter parameter in parameters)
+                // UPDATE parameter name
+                foreach (DbParameter parameter in parameters)
+                {
+                    var oldValue = parameter.ParameterName;
+                    if (oldValue.StartsWith("@"))
                     {
-                        var oldValue = parameter.ParameterName;
-                        if (oldValue.StartsWith("@"))
-                        {
-                            oldValue = oldValue.Substring(1);
-                        }
-                        var newValue = string.Concat("Z_", queryCount, "_", oldValue);
+                        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);
+                    // 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);
-                    }
+                    // REPLACE parameter with new value
+                    sql = sql.Replace("@" + oldValue, "@" + newValue);
                 }
 #elif EFCORE