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

- 优化 FromQuery SQL 生成；

Browse Source
This commit is contained in:
2881099
2022-08-11 11:29:42 +08:00
parent 24e28a8c1b
commit 79e62eeab3
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@@ -800,14 +800,5 @@
<param name="that"></param> <param name="that"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

4
FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs
View File

@@ -637,9 +637,7 @@ FROM (
SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum] SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum]
FROM [TwoTablePartitionBy_User] a ) a FROM [TwoTablePartitionBy_User] a ) a
WHERE (a.[rownum] = 1) ) a WHERE (a.[rownum] = 1) ) a
INNER JOIN ( INNER JOIN [TwoTablePartitionBy_UserExt] b ON a.[Id] = b.[UserId]
SELECT a.[UserId], a.[Remark]
FROM [TwoTablePartitionBy_UserExt] a) b ON a.[Id] = b.[UserId]
WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))"; WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))";
Assert.Equal(sql07, assertSql07); Assert.Equal(sql07, assertSql07);
var list07 = fsql.Select<TwoTablePartitionBy_User>() var list07 = fsql.Select<TwoTablePartitionBy_User>()

4
FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
View File

@@ -134,7 +134,11 @@ namespace FreeSql.Internal.CommonProvider
var select2sp = select2 as Select0Provider; var select2sp = select2 as Select0Provider;
string sql2 = null; string sql2 = null;
if (select2sp._diymemexpWithTempQuery == null) if (select2sp._diymemexpWithTempQuery == null)
{
if (select2sp._tableRule == null && select2sp.IsDefaultSqlContent == true)
return ret;
sql2 = select2?.ToSql(a => a, FieldAliasOptions.AsProperty); sql2 = select2?.ToSql(a => a, FieldAliasOptions.AsProperty);
}
else else
{ {
if (select2sp._tableRule != null && select2sp.IsDefaultSqlContent == true) if (select2sp._tableRule != null && select2sp.IsDefaultSqlContent == true)