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

v3.2.806-preview20231204 - 增加 WithSql().WhereDynamicFilter 的支持；

Browse Source
This commit is contained in:
2881099
2023-12-03 19:52:00 +08:00
parent 60d329265a
commit 2bfb9c2621
35 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
FreeSql/Extensions/FreeSqlGlobalExpressionCallExtensions.cs
View File

@ -162,13 +162,18 @@ namespace FreeSql
expContext.Value.Result = sql;
return false;
}
static object InternalRawField([RawValue] string sql)
{
expContext.Value.Result = sql;
return default;
}
#region 大小判断
/// <summary>
/// 大于 &gt;
/// </summary>
/// <returns></returns>
public static bool GreaterThan<TValue>(TValue value1, TValue value2)
#region 大小判断
/// <summary>
/// 大于 &gt;
/// </summary>
/// <returns></returns>
public static bool GreaterThan<TValue>(TValue value1, TValue value2)
{
expContext.Value.Result = $"{expContext.Value.ParsedContent["value1"]} > {expContext.Value.ParsedContent["value2"]}";
return false;

2
FreeSql/FreeSql.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.806-preview20231201</Version>
<Version>3.2.806-preview20231204</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

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

@ -281,7 +281,9 @@ namespace FreeSql.Internal.CommonProvider
}
}
public Expression ConvertStringPropertyToExpression(string property, bool fromFirstTable = false)
public static MethodInfo _methodSqlExtInternalRawField = typeof(SqlExt).GetMethod("InternalRawField", BindingFlags.NonPublic | BindingFlags.Static);
public static MethodInfo _methodSqlExtInternalRawSql = typeof(SqlExt).GetMethod("InternalRawSql", BindingFlags.NonPublic | BindingFlags.Static);
public Expression ConvertStringPropertyToExpression(string property, bool fromFirstTable = false)
{
if (string.IsNullOrEmpty(property)) return null;
var field = property.Split('.').Select(a => a.Trim()).ToArray();
@ -289,7 +291,16 @@ namespace FreeSql.Internal.CommonProvider
if (field.Length == 1 && fromFirstTable == false)
{
foreach (var tb in _tables)
if (_tables.Count == 1 && _tables[0].Table?.Type == typeof(object))
{
//配合 .Select<object>().WithSql("...").WhereDynamicFilter(...)
var tb = _tables[0];
tb.Parameter = Expression.Parameter(tb.Table.Type, tb.Alias);
var rawField = $"{tb.Alias}.{_commonUtils.QuoteSqlName(field[0])}";
return Expression.Call(_methodSqlExtInternalRawField, Expression.Constant(rawField, typeof(string)));
}
foreach (var tb in _tables)
{
if (tb.Table.ColumnsByCs.TryGetValue(field[0], out var col) &&
tb.Table.Properties.TryGetValue(field[0], out var prop))
@ -1029,7 +1040,7 @@ namespace FreeSql.Internal.CommonProvider
.Select(a => a.ParameterType == typeof(object) ? (object)this :
(a.ParameterType == typeof(string) ? (object)(fi.Value?.ToString()) : (object)null))
.ToArray());
exp = fiValue0MethodReturn is Expression expression ? expression : Expression.Call(typeof(SqlExt).GetMethod("InternalRawSql", BindingFlags.NonPublic | BindingFlags.Static), Expression.Constant(fiValue0MethodReturn?.ToString(), typeof(string)));
exp = fiValue0MethodReturn is Expression expression ? expression : Expression.Call(_methodSqlExtInternalRawSql, Expression.Constant(fiValue0MethodReturn?.ToString(), typeof(string)));
break;
case DynamicFilterOperator.Contains:
@ -1043,6 +1054,16 @@ namespace FreeSql.Internal.CommonProvider
break;
default:
exp = ConvertStringPropertyToExpression(fi.Field);
if (exp.Type == typeof(object) && fi.Value != null)
{
var valueType = fi.Value?.GetType();
if (Utils.dicExecuteArrayRowReadClassOrTuple.ContainsKey(valueType)) exp = Expression.Convert(exp, valueType);
else if (valueType.FullName == "System.Text.Json.JsonElement")
{
var valueKind = valueType.GetProperty("ValueKind").GetValue(fi.Value, null).ToString();
if (valueKind == "Number") exp = Expression.Convert(exp, typeof(decimal));
}
}
break;
}
switch (fi.Operator)

7
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -47,6 +47,13 @@ namespace FreeSql.Internal
) return null;
var tbc = _cacheGetTableByEntity.GetOrAdd(common._orm.Ado.DataType, k1 => new ConcurrentDictionary<Type, TableInfo>()); //区分数据库类型缓存
if (tbc.TryGetValue(entity, out var trytb)) return trytb;
if (entity == typeof(object)) return new TableInfo
{
Type = entity,
CsName = entity.Name,
DbName = entity.Name,
DisableSyncStructure = true,
};
if (common.CodeFirst.GetDbInfo(entity) != null) return null;
if (typeof(IEnumerable).IsAssignableFrom(entity) && entity.IsGenericType == true) return null;
if (entity.IsArray) return null;