diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 26522f10..537315e2 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -800,14 +800,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs index 4e63a548..ceda003c 100644 --- a/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs +++ b/FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs @@ -637,9 +637,7 @@ FROM ( SELECT a.[Id], a.[Nickname], row_number() over( partition by a.[Nickname] order by a.[Id]) [rownum] FROM [TwoTablePartitionBy_User] a ) a WHERE (a.[rownum] = 1) ) a -INNER JOIN ( - SELECT a.[UserId], a.[Remark] - FROM [TwoTablePartitionBy_UserExt] a) b ON a.[Id] = b.[UserId] +INNER JOIN [TwoTablePartitionBy_UserExt] b ON a.[Id] = b.[UserId] WHERE ((a.[Nickname] = N'name03' OR a.[Nickname] = N'name02'))"; Assert.Equal(sql07, assertSql07); var list07 = fsql.Select() diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs index c9cbcc19..75ea26a2 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs @@ -133,8 +133,12 @@ namespace FreeSql.Internal.CommonProvider (_diymemexpWithTempQuery as WithTempQueryParser)?.Append(select2, rettbs[1]); var select2sp = select2 as Select0Provider; 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); + } else { if (select2sp._tableRule != null && select2sp.IsDefaultSqlContent == true)