|
|
@@ -803,6 +803,14 @@ namespace InABox.Core
|
|
|
#endregion
|
|
|
|
|
|
#region And
|
|
|
+
|
|
|
+ public FilterBuilder<T, TProp> And<TProp>(Expression<Func<T, TProp>> expression)
|
|
|
+ {
|
|
|
+ var and = new Filter<T>(CoreUtils.GetFullPropertyName(expression, "."));
|
|
|
+ and.Parent = this;
|
|
|
+ Ands.Add(and);
|
|
|
+ return new FilterBuilder<T, TProp>(and);
|
|
|
+ }
|
|
|
|
|
|
IFilter IFilter.And<T1>(Expression<Func<T1, object>> expression)
|
|
|
{
|
|
|
@@ -826,14 +834,6 @@ namespace InABox.Core
|
|
|
Ands.Add(filter);
|
|
|
return this;
|
|
|
}
|
|
|
-
|
|
|
- public FilterBuilder<T, TProp> And<TProp>(Expression<Func<T, TProp>> expression)
|
|
|
- {
|
|
|
- var and = new Filter<T>(CoreUtils.GetFullPropertyName(expression, "."));
|
|
|
- and.Parent = this;
|
|
|
- Ands.Add(and);
|
|
|
- return new FilterBuilder<T, TProp>(and);
|
|
|
- }
|
|
|
|
|
|
private Filter<T> And(string property)
|
|
|
{
|