Open-Harbor/dotnet-dynamic-linq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better naming.

Browse Source
This commit is contained in:
David 2018-02-12 03:33:51 -06:00
parent b1db7a3604
commit 571ef78e86
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PoweredSoft.DynamicLinq/Fluent/QueryBuilder.cs
View File

@ -73,22 +73,22 @@ namespace PoweredSoft.DynamicLinq.Fluent
var query = Query; var query = Query;
// execute the filters. // execute the filters.
query = ExecuteFilters(query); query = BuildFilters(query);
return query; return query;
} }
protected virtual IQueryable<T> ExecuteFilters(IQueryable<T> query) protected virtual IQueryable<T> BuildFilters(IQueryable<T> query)
{ {
var parameter = Expression.Parameter(typeof(T), "t"); var parameter = Expression.Parameter(typeof(T), "t");
var expression = BuildExpression(parameter, Parts); var expression = BuildFilterExpression(parameter, Parts);
var lambda = Expression.Lambda<Func<T, bool>>(expression, parameter); var lambda = Expression.Lambda<Func<T, bool>>(expression, parameter);
query = query.Where(lambda); query = query.Where(lambda);
return query; return query;
} }
protected virtual Expression BuildExpression(ParameterExpression parameter, List<QueryFilterPart> parts) protected virtual Expression BuildFilterExpression(ParameterExpression parameter, List<QueryFilterPart> parts)
{ {
Expression ret = null; Expression ret = null;
@ -96,9 +96,9 @@ namespace PoweredSoft.DynamicLinq.Fluent
{ {
Expression innerExpression; Expression innerExpression;
if (part.Parts?.Any() == true) if (part.Parts?.Any() == true)
innerExpression = BuildExpression(parameter, part.Parts); innerExpression = BuildFilterExpression(parameter, part.Parts);
else else
innerExpression = BuildExpression(parameter, part); innerExpression = BuildFilterExpression(parameter, part);
if (ret != null) if (ret != null)
ret = part.And ? Expression.And(ret, innerExpression) : Expression.Or(ret, innerExpression); ret = part.And ? Expression.And(ret, innerExpression) : Expression.Or(ret, innerExpression);
@ -109,7 +109,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
return ret; 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 member = QueryableHelpers.ResolvePathForExpression(parameter, part.Path);
var constant = QueryableHelpers.ResolveConstant(member, part.Value, part.ConvertStrategy); var constant = QueryableHelpers.ResolveConstant(member, part.Value, part.ConvertStrategy);