Fix QueryFilter

Fix QueryFilter

Author: zzzprojects

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

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("e4c2af73-caeb-4429-bcb6-0a359484e064")]
-[assembly: AssemblyVersion("1.4.12")]
-[assembly: AssemblyFileVersion("1.4.12")]
+[assembly: AssemblyVersion("1.4.15")]
+[assembly: AssemblyFileVersion("1.4.15")]

src/Z.EntityFramework.Plus.EF5.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.EF5.NET40/QueryFilter/QueryFilter.cs

@@ -40,7 +40,7 @@ public override object ApplyFilter<TEntity>(object query)
             // TODO: Use the same code as (EF5 || EF6) once EF team fix the cast issue: https://github.com/aspnet/EntityFramework/issues/3736
             if(QueryFilterManager.ForceCast)
             {
-                return return Filter((IQueryable<T>) query).Cast<TEntity>();
+                return Filter((IQueryable<T>) query).Cast<TEntity>();
             }
 
             return Filter((IQueryable<T>) query);

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

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("abcbb878-043c-4957-a334-90e9872e684e")]
-[assembly: AssemblyVersion("1.4.12")]
-[assembly: AssemblyFileVersion("1.4.12")]
+[assembly: AssemblyVersion("1.4.15")]
+[assembly: AssemblyFileVersion("1.4.15")]

src/Z.EntityFramework.Plus.EF5/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.EF5/QueryFilter/QueryFilter.cs

@@ -40,7 +40,7 @@ public override object ApplyFilter<TEntity>(object query)
             // TODO: Use the same code as (EF5 || EF6) once EF team fix the cast issue: https://github.com/aspnet/EntityFramework/issues/3736
             if(QueryFilterManager.ForceCast)
             {
-                return return Filter((IQueryable<T>) query).Cast<TEntity>();
+                return Filter((IQueryable<T>) query).Cast<TEntity>();
             }
 
             return Filter((IQueryable<T>) query);

src/Z.EntityFramework.Plus.EF6/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.EFCore/Properties/AssemblyInfo.cs

@@ -18,5 +18,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("c41195f5-937e-4f2b-9f36-20650a804caa")]
-[assembly: AssemblyVersion("1.4.13")]
-[assembly: AssemblyFileVersion("1.4.13")]
+[assembly: AssemblyVersion("1.4.15")]
+[assembly: AssemblyFileVersion("1.4.15")]

src/Z.EntityFramework.Plus.EFCore/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.EFCore/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.13",
+  "version": "1.4.15",
   "description": "EF Bulk Operations & Utilities | Bulk Insert, Update, Delete, Merge from database.",
   "authors": [ "ZZZ Projects Inc." ],
   "packOptions": {