Fix QueryFilter missing line + First attemp to support LinqKit

Fix QueryFilter missing line + First attemp to support LinqKit

Author: zzzprojects

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

@@ -92,6 +92,8 @@ public DbExpression ApplyFilter(DbExpression baseExpression, string fullName)
                         {
                             var visitor = new QueryFilterInterceptorDbProjectExpression();
                             visitor.DbScanExpression = baseExpression;
+                            visitor.ParameterCollection = QueryFilterManager.DbExpressionParameterByHook[expression2];
+
                             var filetered = expression2.Accept(visitor);
                             baseExpression = filetered;
                         }

src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable/IQueryable.GetObjectQuery.cs

@@ -75,6 +75,20 @@ internal static ObjectQuery GetObjectQuery(this IQueryable query)
                 return objectQuery;
             }
 
+            // CHECK if a InnerQuery exists
+            var innerQueryProperty = query.GetType().GetProperty("InnerQuery", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+            if (innerQueryProperty != null)
+            {
+                var innerQuery = innerQueryProperty.GetValue(query, null) as IQueryable;
+
+                if (innerQuery != null && query != innerQuery)
+                {
+                    var innerObjectQuery = innerQuery.GetObjectQuery();
+                    return innerObjectQuery;
+                }
+            }
+
             throw new Exception(ExceptionMessage.GeneralException);
         }
     }

src/shared/Z.EF.Plus._Core.Shared/EF5_EF6/IQueryable`/IQueryable`.GetObjectQuery.cs

@@ -45,6 +45,20 @@ internal static ObjectQuery<T> GetObjectQuery<T>(this IQueryable<T> query)
 
                 if (internalQueryProperty == null)
                 {
+                    // CHECK if a InnerQuery exists
+                    var innerQueryProperty = query.GetType().GetProperty("InnerQuery", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+                    if (innerQueryProperty != null)
+                    {
+                        var innerQuery = innerQueryProperty.GetValue(query, null) as IQueryable<T>;
+
+                        if (innerQuery != null && query != innerQuery)
+                        {
+                            var innerObjectQuery = innerQuery.GetObjectQuery();
+                            return innerObjectQuery;
+                        }
+                    }
+
                     throw new Exception(ExceptionMessage.GeneralException);
                 }
 

version.txt

@@ -1 +1 @@
-v1.6.20
+v1.6.21