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

- 优化 GlobalFilter 子查询传播重复的问题；#642

Browse Source
This commit is contained in:
2881099
2021-01-12 17:14:17 +08:00
parent fcfeacdc95
commit 7379050bfd
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FreeSql.Tests/FreeSql.Tests/PostgreSQL/PostgreSQLExpression/StringTest.cs
View File

@@ -72,6 +72,9 @@ namespace FreeSql.Tests.PostgreSQLExpression
val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.id)); val1 = string.Join("**", fsql.Select<StringJoin01>().ToList(a => a.id));
val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.id))); val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
Assert.Equal(val1, val2[0]); Assert.Equal(val1, val2[0]);
fsql.GlobalFilter.Apply<StringJoin01>("test001", a => a.name.Length > 0);
val2 = fsql.Select<StringJoin01>().ToList(a => string.Join("**", fsql.Select<StringJoin01>().As("b").ToList(b => b.id)));
} }
class StringJoin01 class StringJoin01
{ {

2
FreeSql/Internal/CommonExpression.cs
View File

@@ -1030,7 +1030,7 @@ namespace FreeSql.Internal
{ {
var fsqlGlobalFilter = fsqlSelect0._whereGlobalFilter; var fsqlGlobalFilter = fsqlSelect0._whereGlobalFilter;
if (fsqlGlobalFilter != tsc.whereGlobalFilter) if (fsqlGlobalFilter != tsc.whereGlobalFilter)
fsqlGlobalFilter.AddRange(tsc.whereGlobalFilter); fsqlGlobalFilter.AddRange(tsc.whereGlobalFilter.Where(b => !fsqlGlobalFilter.Any(a => a.Name == b.Name)));
} }
} }
else if (fsqlType != null) else if (fsqlType != null)