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

Think I im ready to test.

Browse Source
This commit is contained in:
David Lebée 2018-04-10 19:29:43 -05:00
parent 8ae2b2313b
commit 3075b565ae
2 changed files with 58 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
PoweredSoft.DynamicLinq.ConsoleApp/BetterProto2.cs
View File

@ -45,7 +45,7 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
public static void Case2() public static void Case2()
{ {
// the expression parser. // the expression parser.
var ep = new ExpressionParser(typeof(Author), "Posts.Author.Posts.Author.Website.Url"); var ep = new ExpressionParser(typeof(Author), "Posts.Author.Website.Url");
new List<Author>().AsQueryable().Select(t => new new List<Author>().AsQueryable().Select(t => new
{ {
@ -112,7 +112,7 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
NullType = groups.ResolveNullHandlingType(); NullType = groups.ResolveNullHandlingType();
Expression currentExpression = null; Expression currentExpression = null;
groups.ReversedForEach(group => foreach(var group in groups.Reversed())
{ {
if (currentExpression == null) if (currentExpression == null)
{ {
@ -122,7 +122,7 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
if (group.Parent == null) if (group.Parent == null)
{ {
currentExpression = groupExpressionLambda; currentExpression = groupExpressionLambda;
return; continue;
} }
var parent = group.Parent; var parent = group.Parent;
@ -130,20 +130,7 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
// check null with where. // check null with where.
if (NullHandling != SelectNullHandling.LeaveAsIs) if (NullHandling != SelectNullHandling.LeaveAsIs)
{ parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression);
if (group.Pieces.Count > 1)
{
var path = string.Join(".", group.Pieces.Take(group.Pieces.Count-1).Select(T => T.Name));
var whereExpression = QueryableHelpers.CreateConditionExpression(group.Parameter.Type, path,
ConditionOperators.NotEqual, null, QueryConvertStrategy.ConvertConstantToComparedPropertyOrField,
parameter: group.Parameter, nullChecking: true);
//public static IEnumerable<TSource> Where<TSource>(this IEnumerable<TSource> source, Func<TSource, bool> predicate);
parentExpression = Expression.Call(typeof(Enumerable), "Where",
new Type[] { parent.GroupEnumerableType() },
parentExpression, whereExpression);
}
}
// the select expression. // the select expression.
var selectType = parent.GroupEnumerableType(); var selectType = parent.GroupEnumerableType();
@ -156,8 +143,11 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
{ {
if (group.Parent == null) if (group.Parent == null)
{ {
if (NullHandling != SelectNullHandling.LeaveAsIs)
currentExpression = CheckNullOnFirstGroup(group, currentExpression);
currentExpression = Expression.Lambda(currentExpression, group.Parameter); currentExpression = Expression.Lambda(currentExpression, group.Parameter);
return; continue;
} }
var parent = group.Parent; var parent = group.Parent;
@ -166,6 +156,43 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
if (NullHandling != SelectNullHandling.LeaveAsIs) if (NullHandling != SelectNullHandling.LeaveAsIs)
parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression);
var currentExpressionLambda = Expression.Lambda(currentExpression, group.Parameter);
currentExpression = Expression.Call(typeof(Enumerable), "Select",
new Type[] { selectType, currentExpression.Type },
parentExpression, currentExpressionLambda);
}
}
Result = currentExpression;
}
private Expression CheckNullOnFirstGroup(ExpressionParserPieceGroup group, Expression currentExpression)
{
var path = string.Join(".", group.Pieces.Select(t => t.Name));
var whereExpression = QueryableHelpers.CreateConditionExpression(group.Parameter.Type, path,
ConditionOperators.NotEqual, null, QueryConvertStrategy.ConvertConstantToComparedPropertyOrField,
parameter: group.Parameter, nullChecking: true);
var whereBodyExpression = (whereExpression as LambdaExpression).Body;
Expression ifTrueExpression = null;
if (QueryableHelpers.IsGenericEnumerable(NullType))
{
var listType = typeof(List<>).MakeGenericType(NullType.GenericTypeArguments.First());
ifTrueExpression = Expression.New(listType);
}
else
{
ifTrueExpression = Expression.Default(NullType);
}
return Expression.Condition(whereBodyExpression, ifTrueExpression, currentExpression, currentExpression.Type);
}
private static Expression CheckNullOnEnumerableParent(ExpressionParserPieceGroup group, ExpressionParserPieceGroup parent, Expression parentExpression)
{ {
if (group.Pieces.Count > 1) if (group.Pieces.Count > 1)
{ {
@ -179,16 +206,12 @@ namespace PoweredSoft.DynamicLinq.ConsoleApp
new Type[] { parent.GroupEnumerableType() }, new Type[] { parent.GroupEnumerableType() },
parentExpression, whereExpression); parentExpression, whereExpression);
} }
else
{
} }
var currentExpressionLambda = Expression.Lambda(currentExpression, group.Parameter); return parentExpression;
currentExpression = Expression.Call(typeof(Enumerable), "Select",
new Type[] { selectType, currentExpression.Type },
parentExpression, currentExpressionLambda);
}
});
Result = currentExpression;
} }
} }
} }

2
PoweredSoft.DynamicLinq/Parser/ParserExtensions.cs
View File

@ -25,7 +25,7 @@ namespace PoweredSoft.DynamicLinq.Parser
{ {
if (groups.Count() == 1) if (groups.Count() == 1)
{ {
throw new NotImplementedException(); return groups.First().Pieces.Last().Type;
} }
var type = groups.Last().Pieces.Last().Type; var type = groups.Last().Pieces.Last().Type;