Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix157 #158

Merged
merged 1 commit into from
Apr 28, 2018
+32 −8
Merged

Fix157 #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions src/System.Linq.Dynamic.Core/DynamicQueryableExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
using System.Reflection;
using JetBrains.Annotations;
using System.Linq.Dynamic.Core.Parser;
using System.Text;

#if WINDOWS_APP
using System;
using System.Linq;
Expand All @@ -28,7 +30,6 @@ public static class DynamicQueryableExtensions
#if !(WINDOWS_APP45x || SILVERLIGHT)
private static readonly TraceSource TraceSource = new TraceSource(typeof(DynamicQueryableExtensions).Name);
#endif
private static readonly Func<MethodInfo, bool> PredicateParameterHas2 = mi => mi.GetParameters()[1].ToString().Contains("Func`2");

private static Expression OptimizeExpression(Expression expression)
{
Expand Down Expand Up @@ -1451,7 +1452,15 @@ public static IQueryable Skip([NotNull] this IQueryable source, int count)
#endregion Skip

#region SkipWhile
private static readonly MethodInfo _skipWhilePredicate = GetMethod(nameof(Queryable.SkipWhile), 1, PredicateParameterHas2);

private static readonly MethodInfo _skipWhilePredicate = GetMethod(nameof(Queryable.SkipWhile), 1, mi =>
{
return mi.GetParameters().Length == 2 &&
mi.GetParameters()[1].ParameterType.GetTypeInfo().IsGenericType &&
mi.GetParameters()[1].ParameterType.GetGenericTypeDefinition() == typeof(Expression<>) &&
mi.GetParameters()[1].ParameterType.GetGenericArguments()[0].GetTypeInfo().IsGenericType &&
mi.GetParameters()[1].ParameterType.GetGenericArguments()[0].GetGenericTypeDefinition() == typeof(Func<,>);
});

/// <summary>
/// Bypasses elements in a sequence as long as a specified condition is true and then returns the remaining elements.
Expand Down Expand Up @@ -1512,7 +1521,15 @@ public static IQueryable Take([NotNull] this IQueryable source, int count)
#endregion Take

#region TakeWhile
private static readonly MethodInfo _takeWhilePredicate = GetMethod(nameof(Queryable.TakeWhile), 1, PredicateParameterHas2);

private static readonly MethodInfo _takeWhilePredicate = GetMethod(nameof(Queryable.TakeWhile), 1, mi =>
{
return mi.GetParameters().Length == 2 &&
mi.GetParameters()[1].ParameterType.GetTypeInfo().IsGenericType &&
mi.GetParameters()[1].ParameterType.GetGenericTypeDefinition() == typeof(Expression<>) &&
mi.GetParameters()[1].ParameterType.GetGenericArguments()[0].GetTypeInfo().IsGenericType &&
mi.GetParameters()[1].ParameterType.GetGenericArguments()[0].GetGenericTypeDefinition() == typeof(Func<,>);
});

/// <summary>
/// Returns elements from a sequence as long as a specified condition is true.
Expand Down Expand Up @@ -1793,11 +1810,18 @@ private static TResult Execute<TResult>(MethodInfo operatorMethodInfo, IQueryabl
return source.Provider.Execute<TResult>(optimized);
}

private static MethodInfo GetMethod<TResult>(string name, int parameterCount = 0, Func<MethodInfo, bool> predicate = null) =>
GetMethod(name, parameterCount, mi => mi.ReturnType == typeof(TResult) && (predicate == null || predicate(mi)));

private static MethodInfo GetMethod(string name, int parameterCount = 0, Func<MethodInfo, bool> predicate = null) =>
typeof(Queryable).GetTypeInfo().GetDeclaredMethods(name).Single(mi => mi.GetParameters().Length == parameterCount + 1 && (predicate == null || predicate(mi)));
private static MethodInfo GetMethod(string name, int parameterCount = 0, Func<MethodInfo, bool> predicate = null)
{
try
{
return typeof(Queryable).GetTypeInfo().GetDeclaredMethods(name).Single(mi =>
mi.GetParameters().Length == parameterCount + 1 && (predicate == null || predicate(mi)));
}
catch (Exception ex)
{
throw new Exception("Method not found: " + name, ex);
}
}
#endregion Private Helpers
}
}