weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-06 16:30:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

-修复 ZeroDbEntity WhereDynamic DateRange 问题；

Browse Source
This commit is contained in:
2881099
2025-09-12 14:49:29 +08:00
parent 6d77d67fc0
commit df0acfc7a3
3 changed files with 242 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Extensions/FreeSql.Extensions.ZeroEntity/ZeroDbContext.SelectImpl.cs
View File

@@ -717,7 +717,7 @@ namespace FreeSql.Extensions.ZeroEntity
string ParseDynamicFilter(DynamicFilterInfo filter)
{
var replacedFilter = new DynamicFilterInfo();
var replacedMap = new List<NativeTuple<string, string, string>>();
var replacedMap = new List<NativeTuple<string, string, string, DynamicFilterInfo>>();
LocalCloneFilter(filter, replacedFilter);
var oldWhere = _selectProvider._where.ToString();
var newWhere = "";
@@ -734,14 +734,13 @@ namespace FreeSql.Extensions.ZeroEntity
foreach (var rm in replacedMap)
{
var find = $"{_selectProvider._tables[0].Alias}.{_common.QuoteSqlName(rm.Item1)}";
while (true)
var forend = rm.Item4.Operator == DynamicFilterOperator.DateRange ||
rm.Item4.Operator == DynamicFilterOperator.Range ? 2 : 1;
for (var forstart = 0; forstart < forend; forstart++)
{
var idx = newWhere.IndexOf(find);
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]"))
newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
else
break;
}
var idx = newWhere.IndexOf(find);
if (idx != -1 && !Regex.IsMatch(newWhere.Substring(idx - 1, 1), @"[\w_]")) newWhere = $"{newWhere.Substring(0, idx)}{rm.Item2}{newWhere.Substring(idx + find.Length)}";
}
}
return newWhere;
@@ -760,7 +759,7 @@ namespace FreeSql.Extensions.ZeroEntity
target.Field = pname;
else
target.Field = TestDynamicFilterInfo._dictTypeToPropertyname[typeof(string)];
replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1, parseResult.Item3));
replacedMap.Add(NativeTuple.Create(target.Field, parseResult.Item1, parseResult.Item3, source));
}
}
if (source.Filters?.Any() == true)