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

Merge pull request #5 from Jon-Galloway/master

Browse Source 
added NotContains
This commit is contained in:
dlebee 2019-03-19 18:00:15 -04:00 committed by GitHub
commit 914371b540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PoweredSoft.DynamicLinq.Test/ShortcutTests.cs
View File

@ -170,5 +170,29 @@ namespace PoweredSoft.DynamicLinq.Test
var q3b = Persons.AsQueryable().Where(t => t.LastName.Contains("ee") || t.LastName.Contains("ar"));
QueryableAssert.AreEqual(q3, q3b);
}
[TestMethod]
public void NotContains()
{
var q1 = Persons.AsQueryable().Query(t => t.NotContains("LastName", "ee"));
var q1b = Persons.AsQueryable().Where(t => !t.LastName.Contains("ee"));
QueryableAssert.AreEqual(q1, q1b);
var q2 = Persons.AsQueryable().Query(t => t.NotContains("LastName", "ee").AndNotContains("FirstName", "vid"));
var q2b = Persons.AsQueryable().Where(t => !t.LastName.Contains("ee") && !t.FirstName.Contains("vid"));
QueryableAssert.AreEqual(q2, q2b);
var q3 = Persons.AsQueryable().Query(t => t.NotContains("LastName", "ee").OrNotContains("LastName", "ar"));
var q3b = Persons.AsQueryable().Where(t => !t.LastName.Contains("ee") || !t.LastName.Contains("ar"));
QueryableAssert.AreEqual(q3, q3b);
}
[TestMethod]
public void ContainsAndNotContains()
{
var q1 = Persons.AsQueryable().Query(t => t.Contains("LastName", "s").AndNotContains("LastName", "r"));
var q1b = Persons.AsQueryable().Where(t => t.LastName.Contains("s") && !t.LastName.Contains("r"));
QueryableAssert.AreEqual(q1, q1b);
}
}
}

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

@ -60,6 +60,22 @@ namespace PoweredSoft.DynamicLinq.Test
QueryableAssert.AreEqual(a, b, "CaseInsensitive");
}
[TestMethod]
public void NotContains()
{
IQueryable<MockPersonObject> a, b;
// case sensitive.
a = Persons.AsQueryable().Query(t => t.NotContains("FirstName", "vi", stringComparision: null));
b = Persons.AsQueryable().Where(t => !t.FirstName.Contains("vi"));
QueryableAssert.AreEqual(a, b, "CaseSensitive");
// not case sensitive
a = Persons.AsQueryable().Query(t => t.NotContains("FirstName", "VI", stringComparision: StringComparison.OrdinalIgnoreCase));
b = Persons.AsQueryable().Where(t => t.FirstName.IndexOf("VI", StringComparison.OrdinalIgnoreCase) == -1);
QueryableAssert.AreEqual(a, b, "CaseInsensitive");
}
[TestMethod]
public void StartsWith()
{

1
PoweredSoft.DynamicLinq/Constants.cs
View File

@ -16,6 +16,7 @@ namespace PoweredSoft.DynamicLinq
LessThan,
LessThanOrEqual,
Contains,
NotContains,
StartsWith,
EndsWith,
In,

11
PoweredSoft.DynamicLinq/Fluent/Where/WhereBuilder.shortcuts.cs
View File

@ -97,6 +97,17 @@ namespace PoweredSoft.DynamicLinq.Fluent
=> Or(path, ConditionOperators.Contains, value, convertStrategy: convertStrategy, collectionHandling: collectionHandling, stringComparision: stringComparision);
#endregion
#region not contains
public WhereBuilder NotContains(string path, object value, QueryConvertStrategy convertStrategy = QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling collectionHandling = QueryCollectionHandling.Any, StringComparison? stringComparision = null)
=> And(path, ConditionOperators.NotContains, value, convertStrategy: convertStrategy, collectionHandling: collectionHandling, stringComparision: stringComparision);
public WhereBuilder AndNotContains(string path, object value, QueryConvertStrategy convertStrategy = QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling collectionHandling = QueryCollectionHandling.Any, StringComparison? stringComparision = null)
=> And(path, ConditionOperators.NotContains, value, convertStrategy: convertStrategy, collectionHandling: collectionHandling, stringComparision: stringComparision);
public WhereBuilder OrNotContains(string path, object value, QueryConvertStrategy convertStrategy = QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling collectionHandling = QueryCollectionHandling.Any, StringComparison? stringComparision = null)
=> Or(path, ConditionOperators.NotContains, value, convertStrategy: convertStrategy, collectionHandling: collectionHandling, stringComparision: stringComparision);
#endregion
#region starts with
public WhereBuilder StartsWith(string path, object value, QueryConvertStrategy convertStrategy = QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling collectionHandling = QueryCollectionHandling.Any, StringComparison? stringComparision = null)
=> And(path, ConditionOperators.StartsWith, value, convertStrategy: convertStrategy, collectionHandling: collectionHandling, stringComparision: stringComparision);

7
PoweredSoft.DynamicLinq/Helpers/QueryableHelpers.cs
View File

@ -61,6 +61,13 @@ namespace PoweredSoft.DynamicLinq.Helpers
else
ret = Expression.Call(member, Constants.ContainsMethod, constant);
}
else if (conditionOperator == ConditionOperators.NotContains)
{
if (member.Type == stringType && stringComparision.HasValue)
ret = Expression.GreaterThan(Expression.Not(Expression.Call(member, Constants.IndexOfMethod, constant, Expression.Constant(stringComparision.Value))), Expression.Constant(-1));
else
ret = Expression.Not(Expression.Call(member, Constants.ContainsMethod, constant));
}
else if (conditionOperator == ConditionOperators.StartsWith)
{
if (member.Type == stringType && stringComparision.HasValue)