tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 17:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 增加 WhereDynamicFilter 操作符 Range/Any，实现范围/In查询；

Browse Source
This commit is contained in:
28810
2020-06-01 10:36:34 +08:00
parent 909fe9bc7a
commit 4dd4f23257
5 changed files with 260 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
View File

@@ -1029,6 +1029,8 @@ namespace FreeSql.Internal.CommonProvider
static MethodInfo MethodStringContains = typeof(string).GetMethod("Contains", new[] { typeof(string) });
static MethodInfo MethodStringStartsWith = typeof(string).GetMethod("StartsWith", new[] { typeof(string) });
static MethodInfo MethodStringEndsWith = typeof(string).GetMethod("EndsWith", new[] { typeof(string) });
static ConcurrentDictionary<Type, MethodInfo> MethodEnumerableContainsDic = new ConcurrentDictionary<Type, MethodInfo>();
static MethodInfo GetMethodEnumerableContains(Type elementType) => MethodEnumerableContainsDic.GetOrAdd(elementType, et => typeof(Enumerable).GetMethods().Where(a => a.Name == "Contains").FirstOrDefault().MakeGenericMethod(elementType));
public TSelect WhereDynamicFilter(DynamicFilterInfo filter)
{
if (filter == null) return this as TSelect;
@@ -1089,14 +1091,27 @@ namespace FreeSql.Internal.CommonProvider
case DynamicFilterOperator.NotStartsWith: exp = Expression.Not(Expression.Call(exp, MethodStringStartsWith, Expression.Constant(fi.Value))); break;
case DynamicFilterOperator.NotEndsWith: exp = Expression.Not(Expression.Call(exp, MethodStringEndsWith, Expression.Constant(fi.Value))); break;
case DynamicFilterOperator.Eq:
case DynamicFilterOperator.Equals:
case DynamicFilterOperator.Eq: exp = Expression.Equal(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.Equal: exp = Expression.Equal(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.NotEqual: exp = Expression.NotEqual(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.GreaterThan: exp = Expression.GreaterThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.GreaterThanOrEqual: exp = Expression.GreaterThanOrEqual(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.LessThan: exp = Expression.LessThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.LessThanOrEqual: exp = Expression.LessThanOrEqual(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fi.Value), exp.Type)); break;
case DynamicFilterOperator.Range:
var fiValueRangeArray = fi.Value.Split(',');
if (fiValueRangeArray.Length != 2) throw new ArgumentException($"Range 对应 Value 应该逗号分割，并且长度为 2");
exp = Expression.AndAlso(
Expression.GreaterThanOrEqual(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueRangeArray[0]), exp.Type)),
Expression.LessThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueRangeArray[1]), exp.Type)));
break;
case DynamicFilterOperator.Any:
var fiValueAnyArray = fi.Value.Split(',');
var fiValueAnyArrayType = exp.Type.MakeArrayType();
exp = Expression.Call(GetMethodEnumerableContains(exp.Type), Expression.Constant(Utils.GetDataReaderValue(fiValueAnyArrayType, fiValueAnyArray), fiValueAnyArrayType), exp);
break;
}
var sql = _commonExpression.ExpressionWhereLambda(_tables, exp, null, null, _params);

24
FreeSql/Internal/Model/DynamicFilterInfo.cs
View File

@@ -55,9 +55,19 @@ namespace FreeSql.Internal.Model
NotEndsWith,
/// <summary>
/// =
/// =<para></para>
/// Equal/Equals/Eq 效果相同
/// </summary>
Equal,
/// <summary>
/// =<para></para>
/// Equal/Equals/Eq 效果相同
/// </summary>
Equals,
/// <summary>
/// =<para></para>
/// Equal/Equals/Eq 效果相同
/// </summary>
Eq,
/// <summary>
/// &lt;&gt;
@@ -80,5 +90,17 @@ namespace FreeSql.Internal.Model
/// &lt;=
/// </summary>
LessThanOrEqual,
/// <summary>
/// &gt;= and &lt;<para></para>
/// 此时 Value 的值格式为逗号分割：value1,value2
/// </summary>
Range,
/// <summary>
/// in (1,2,3)<para></para>
/// 此时 Value 的值格式为逗号分割：value1,value2,value3...
/// </summary>
Any
}
}