From 79e62eeab3ef07d75565986965cc07b39bd85107 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Thu, 11 Aug 2022 11:29:42 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=20FromQuery=20SQL=20?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeSql.DbContext/FreeSql.DbContext.xml                  | 9 ---------
 .../SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs   | 4 +---
 .../CommonProvider/SelectProvider/Select1Provider.cs     | 6 +++++-
 3 files changed, 6 insertions(+), 13 deletions(-)

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 @@
             <param name="that"></param>
             <returns></returns>
         </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>
 </doc>
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<TwoTablePartitionBy_User>()
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)