diff --git a/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs b/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs index 32bf74d..48c39f9 100644 --- a/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs +++ b/PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs @@ -73,22 +73,22 @@ namespace PoweredSoft.DynamicLinq.Fluent var query = Query; // execute the filters. - query = ExecuteFilters(query); + query = BuildFilters(query); return query; } - protected virtual IQueryable ExecuteFilters(IQueryable query) + protected virtual IQueryable BuildFilters(IQueryable query) { var parameter = Expression.Parameter(typeof(T), "t"); - var expression = BuildExpression(parameter, Parts); + var expression = BuildFilterExpression(parameter, Parts); var lambda = Expression.Lambda>(expression, parameter); query = query.Where(lambda); return query; } - protected virtual Expression BuildExpression(ParameterExpression parameter, List parts) + protected virtual Expression BuildFilterExpression(ParameterExpression parameter, List parts) { Expression ret = null; @@ -96,9 +96,9 @@ namespace PoweredSoft.DynamicLinq.Fluent { Expression innerExpression; if (part.Parts?.Any() == true) - innerExpression = BuildExpression(parameter, part.Parts); + innerExpression = BuildFilterExpression(parameter, part.Parts); else - innerExpression = BuildExpression(parameter, part); + innerExpression = BuildFilterExpression(parameter, part); if (ret != null) ret = part.And ? Expression.And(ret, innerExpression) : Expression.Or(ret, innerExpression); @@ -109,7 +109,7 @@ namespace PoweredSoft.DynamicLinq.Fluent return ret; } - protected virtual Expression BuildExpression(ParameterExpression parameter, QueryFilterPart part) + protected virtual Expression BuildFilterExpression(ParameterExpression parameter, QueryFilterPart part) { var member = QueryableHelpers.ResolvePathForExpression(parameter, part.Path); var constant = QueryableHelpers.ResolveConstant(member, part.Value, part.ConvertStrategy);