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

Enabled LessThan[OrEqual], GreaterThan[OrEqual] on strings using CompareTo method

Browse Source
This commit is contained in:
Boris Milašinović 2019-11-27 19:18:33 +01:00
parent 12642af4de
commit 2502f6acf4
3 changed files with 77 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
PoweredSoft.DynamicLinq.Test/StringComparision.cs
View File

@ -123,5 +123,57 @@ namespace PoweredSoft.DynamicLinq.Test
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
PoweredSoft.DynamicLinq/Constants.cs
View File

@ -78,5 +78,6 @@ namespace PoweredSoft.DynamicLinq
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
PoweredSoft.DynamicLinq/Helpers/QueryableHelpers.cs
View File

@ -47,13 +47,33 @@ namespace PoweredSoft.DynamicLinq.Helpers
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)