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

select many support for flattening.

Browse Source
This commit is contained in:
David Lebee 2018-04-11 21:39:54 -05:00
parent 0e7aca052c
commit e961c38c99
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
PoweredSoft.DynamicLinq/Resolver/PathExpressionResolver.cs
View File

@ -66,11 +66,22 @@ namespace PoweredSoft.DynamicLinq.Resolver
parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression, isLastGroup); parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression, isLastGroup);
// the select expression. // the select expression.
var selectType = parent.GroupEnumerableType(); if (CollectionHandling == SelectCollectionHandling.Flatten && QueryableHelpers.IsGenericEnumerable(groupExpression))
var selectExpression = Expression.Call(typeof(Enumerable), "Select", {
new Type[] { selectType, groupExpression.Type }, var selectType = parent.GroupEnumerableType();
parentExpression, groupExpressionLambda); var selectExpression = Expression.Call(typeof(Enumerable), "SelectMany",
currentExpression = selectExpression; new Type[] { selectType, groupExpression.Type.GenericTypeArguments.First() },
parentExpression, groupExpressionLambda);
currentExpression = selectExpression;
}
else
{
var selectType = parent.GroupEnumerableType();
var selectExpression = Expression.Call(typeof(Enumerable), "Select",
new Type[] { selectType, groupExpression.Type },
parentExpression, groupExpressionLambda);
currentExpression = selectExpression;
}
} }
else else
{ {
@ -91,10 +102,20 @@ namespace PoweredSoft.DynamicLinq.Resolver
if (NullChecking != false) if (NullChecking != false)
parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression, isLastGroup); parentExpression = CheckNullOnEnumerableParent(group, parent, parentExpression, isLastGroup);
var currentExpressionLambda = Expression.Lambda(currentExpression, group.Parameter); if (CollectionHandling == SelectCollectionHandling.Flatten && QueryableHelpers.IsGenericEnumerable(currentExpression))
currentExpression = Expression.Call(typeof(Enumerable), "Select", {
new Type[] { selectType, currentExpression.Type }, var currentExpressionLambda = Expression.Lambda(currentExpression, group.Parameter);
parentExpression, currentExpressionLambda); currentExpression = Expression.Call(typeof(Enumerable), "SelectMany",
new Type[] { selectType, currentExpression.Type.GenericTypeArguments.First() },
parentExpression, currentExpressionLambda);
}
else
{
var currentExpressionLambda = Expression.Lambda(currentExpression, group.Parameter);
currentExpression = Expression.Call(typeof(Enumerable), "Select",
new Type[] { selectType, currentExpression.Type },
parentExpression, currentExpressionLambda);
}
} }
} }