Skip to content

Enabled LessThan[OrEqual], GreaterThan[OrEqual] on strings #8

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

Merged
merged 1 commit into from
Nov 27, 2019
Merged

Enabled LessThan[OrEqual], GreaterThan[OrEqual] on strings #8

Show file tree
Hide file tree
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
52 changes: 52 additions & 0 deletions PoweredSoft.DynamicLinq.Test/StringComparision.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,57 @@ public void EndsWith()
b = Persons.AsQueryable().Where(t => t.FirstName.EndsWith("VID", StringComparison.OrdinalIgnoreCase));
QueryableAssert.AreEqual(a, b, "CaseInsensitive");
}

[DataTestMethod]
[DataRow("Denis")]
[DataRow("Ann")]
[DataRow("Tony")]
public void LessThan(string firstName)
{
IQueryable<MockPersonObject> a, b;

a = Persons.AsQueryable().Query(t => t.LessThan("FirstName", firstName));
b = Persons.AsQueryable().Where(t => t.FirstName.CompareTo(firstName) < 0);
QueryableAssert.AreEqual(a, b);
}

[DataTestMethod]
[DataRow("Denis")]
[DataRow("Ann")]
[DataRow("Tony")]
public void LessThanOrEqual(string firstName)
{
IQueryable<MockPersonObject> a, b;

a = Persons.AsQueryable().Query(t => t.LessThanOrEqual("FirstName", firstName));
b = Persons.AsQueryable().Where(t => t.FirstName.CompareTo(firstName) <= 0);
QueryableAssert.AreEqual(a, b);
}

[DataTestMethod]
[DataRow("Denis")]
[DataRow("Ann")]
[DataRow("Tony")]
public void GreaterThan(string firstName)
{
IQueryable<MockPersonObject> a, b;

a = Persons.AsQueryable().Query(t => t.GreaterThan("FirstName", firstName));
b = Persons.AsQueryable().Where(t => t.FirstName.CompareTo(firstName) > 0);
QueryableAssert.AreEqual(a, b);
}

[DataTestMethod]
[DataRow("Denis")]
[DataRow("Ann")]
[DataRow("Tony")]
public void GreaterThanOrEqual(string firstName)
{
IQueryable<MockPersonObject> a, b;

a = Persons.AsQueryable().Query(t => t.GreaterThanOrEqual("FirstName", firstName));
b = Persons.AsQueryable().Where(t => t.FirstName.CompareTo(firstName) >= 0);
QueryableAssert.AreEqual(a, b);
}
}
}
1 change: 1 addition & 0 deletions PoweredSoft.DynamicLinq/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,6 @@ internal static class Constants
internal static readonly MethodInfo IndexOfMethod = typeof(string).GetMethod("IndexOf", new Type[] { typeof(string), typeof(StringComparison) });
internal static readonly MethodInfo AnyMethod = typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public).First(t => t.Name == "Any" && t.GetParameters().Count() == 2);
internal static readonly MethodInfo AllMethod = typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public).First(t => t.Name == "All" && t.GetParameters().Count() == 2);
internal static readonly MethodInfo CompareToMethod = typeof(string).GetMethod("CompareTo", new Type[] { typeof(string) });
}
}
28 changes: 24 additions & 4 deletions PoweredSoft.DynamicLinq/Helpers/QueryableHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,33 @@ public static Expression GetConditionExpressionForMember(ParameterExpression par
ret = Expression.NotEqual(member, constant);
}
else if (conditionOperator == ConditionOperators.GreaterThan)
ret = Expression.GreaterThan(member, constant);
{
if (member.Type == stringType)
ret = Expression.GreaterThan(Expression.Call(member, Constants.CompareToMethod, constant), Expression.Constant(0));
else
ret = Expression.GreaterThan(member, constant);
}
else if (conditionOperator == ConditionOperators.GreaterThanOrEqual)
ret = Expression.GreaterThanOrEqual(member, constant);
{
if (member.Type == stringType)
ret = Expression.GreaterThanOrEqual(Expression.Call(member, Constants.CompareToMethod, constant), Expression.Constant(0));
else
ret = Expression.GreaterThanOrEqual(member, constant);
}
else if (conditionOperator == ConditionOperators.LessThan)
ret = Expression.LessThan(member, constant);
{
if (member.Type == stringType)
ret = Expression.LessThan(Expression.Call(member, Constants.CompareToMethod, constant), Expression.Constant(0));
else
ret = Expression.LessThan(member, constant);
}
else if (conditionOperator == ConditionOperators.LessThanOrEqual)
ret = Expression.LessThanOrEqual(member, constant);
{
if (member.Type == stringType)
ret = Expression.LessThanOrEqual(Expression.Call(member, Constants.CompareToMethod, constant), Expression.Constant(0));
else
ret = Expression.LessThanOrEqual(member, constant);
}
else if (conditionOperator == ConditionOperators.Contains)
{
if (member.Type == stringType && stringComparision.HasValue)
Expand Down