- 修复 FromQuery + WithTempQuery 嵌套查询多层后别名问题；#1510

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -733,15 +733,6 @@
             <param name="modelBuilder"></param>
             <returns></returns>
         </member>
-        <member name="M:FreeSqlDbContextExtensions.ApplyConfigurationsFromAssembly(FreeSql.ICodeFirst,System.Reflection.Assembly,System.Func{System.Type,System.Boolean})">
-            <summary>
-            根据Assembly扫描所有继承IEntityTypeConfiguration&lt;T&gt;的配置类
-            </summary>
-            <param name="codeFirst"></param>
-            <param name="assembly"></param>
-            <param name="predicate"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)">
             <summary>
             创建普通数据上下文档对象
@@ -800,14 +791,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>

FreeSql.Tests/FreeSql.Tests/SqlServer/Curd/SqlServerSelectWithTempQueryTest.cs

@@ -9,6 +9,175 @@ namespace FreeSql.Tests.SqlServer
 {
     public class SqlServerSelectWithTempQueryTest
     {
+        [Fact]
+        public void Issues1510()
+        {
+            var fsql = g.mysql;
+
+            var query = fsql.Select<Issues1510T1>()
+                     .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => e))
+                     .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                     .WithTempQuery(t => new
+                     {
+                         t.t1.Id,
+                         t.t1.Name,
+                         T2Id = t.t2.Id,
+                         T2Name = t.t1.Name,
+                     });
+            var sql = query.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id`, a.`Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM `Issues1510T1` a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM `Issues1510T2` a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query.ToList();
+
+            query = fsql.Select<Issues1510T1>()
+                     .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => e).WithTempQuery(e => e))
+                     .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                     .WithTempQuery(t => new
+                     {
+                         t.t1.Id,
+                         t.t1.Name,
+                         T2Id = t.t2.Id,
+                         T2Name = t.t1.Name,
+                     });
+            sql = query.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id`, a.`Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM `Issues1510T1` a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM ( 
+            SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+            FROM `Issues1510T2` a ) a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query.ToList();
+
+            query = fsql.Select<Issues1510T1>()
+                     .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => new { T2 = e }).WithTempQuery(e => e.T2))
+                     .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                     .WithTempQuery(t => new
+                     {
+                         t.t1.Id,
+                         t.t1.Name,
+                         T2Id = t.t2.Id,
+                         T2Name = t.t1.Name,
+                     });
+            sql = query.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id`, a.`Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM `Issues1510T1` a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM ( 
+            SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+            FROM `Issues1510T2` a ) a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query.ToList();
+
+            //////////////////////////
+
+            var query2 = fsql.Select<Issues1510T1>()
+                .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => e))
+                .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                .WithTempQuery(t => new
+                {
+                    T1Id = t.t1.Id,
+                    T1Name = t.t1.Name,
+                    T2Id = t.t2.Id,
+                    T2Name = t.t1.Name,
+                });
+            sql = query2.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id` `T1Id`, a.`Name` `T1Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM `Issues1510T1` a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM `Issues1510T2` a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query2.ToList();
+
+            query2 = fsql.Select<Issues1510T1>()
+                .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => new { T2 = e }).WithTempQuery(e => e.T2))
+                .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                .WithTempQuery(t => new
+                {
+                    T1Id = t.t1.Id,
+                    T1Name = t.t1.Name,
+                    T2Id = t.t2.Id,
+                    T2Name = t.t1.Name,
+                });
+            sql = query2.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id` `T1Id`, a.`Name` `T1Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM `Issues1510T1` a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM ( 
+            SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+            FROM `Issues1510T2` a ) a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query2.ToList();
+
+            query2 = fsql.Select<Issues1510T1>()
+                .WithTempQuery(e => e)
+                .FromQuery(fsql.Select<Issues1510T2>())
+                .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                .WithTempQuery(t => new
+                {
+                    T1Id = t.t1.Id,
+                    T1Name = t.t1.Name,
+                    T2Id = t.t2.Id,
+                    T2Name = t.t1.Name,
+                });
+            sql = query2.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id` `T1Id`, a.`Name` `T1Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM ( 
+        SELECT a.`Id`, a.`Name` 
+        FROM `Issues1510T1` a ) a 
+    INNER JOIN `Issues1510T2` htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query2.ToList();
+
+            query2 = fsql.Select<Issues1510T1>()
+                .WithTempQuery(e => e)
+                .FromQuery(fsql.Select<Issues1510T2>().WithTempQuery(e => e))
+                .InnerJoin(t => t.t1.Id == t.t2.T1JoinId)
+                .WithTempQuery(t => new
+                {
+                    T1Id = t.t1.Id,
+                    T1Name = t.t1.Name,
+                    T2Id = t.t2.Id,
+                    T2Name = t.t1.Name,
+                });
+            sql = query2.ToSql();
+            Assert.Equal(sql, @"SELECT * 
+FROM ( 
+    SELECT a.`Id` `T1Id`, a.`Name` `T1Name`, htb.`Id` `T2Id`, a.`Name` `T2Name` 
+    FROM ( 
+        SELECT a.`Id`, a.`Name` 
+        FROM `Issues1510T1` a ) a 
+    INNER JOIN ( 
+        SELECT a.`Id`, a.`Name`, a.`T1JoinId` 
+        FROM `Issues1510T2` a ) htb ON a.`Id` = htb.`T1JoinId` ) a");
+            query2.ToList();
+        }
+        public class Issues1510T1
+        {
+            public long Id { get; set; }
+            public string Name { get; set; }
+        }
+        public class Issues1510T2
+        {
+            public long Id { get; set; }
+            public string Name { get; set; }
+            public long T1JoinId { get; set; }
+        }
+
         [Fact]
         public void Issues1467()
         {

FreeSql/FreeSql.xml

@@ -1073,55 +1073,6 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
-            <summary>
-            动态创建实体类型
-            </summary>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
-            <summary>
-            配置Class
-            </summary>
-            <param name="className">类名</param>
-            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
-            <summary>
-            配置属性
-            </summary>
-            <param name="propertyName">属性名称</param>
-            <param name="propertyType">属性类型</param>
-            <param name="attributes">属性标记的特性-支持多个</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
-            <summary>
-            配置父类
-            </summary>
-            <param name="superClass">父类类型</param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
-            <summary>
-            Emit动态创建出Class - Type
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
-            <summary>
-            首字母小写
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
-            <summary>
-            首字母大写
-            </summary>
-            <param name="input"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 null
@@ -5741,28 +5692,6 @@
             请使用 fsql.InsertDict(dict) 方法插入字典数据
             </summary>
         </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
-            <summary>
-            动态构建Class Type
-            </summary>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
-            <summary>
-            根据字典，创建 table 对应的实体对象
-            </summary>
-            <param name="table"></param>
-            <param name="dict"></param>
-            <returns></returns>
-        </member>
-        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
-            <summary>
-            根据实体对象，创建 table 对应的字典
-            </summary>
-            <param name="table"></param>
-            <param name="instance"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>

FreeSql/Internal/CommonExpression.cs

@@ -71,7 +71,16 @@ namespace FreeSql.Internal
                     field.Append(_common.FieldAsAlias(parent.DbNestedField));
                 }
                 else if (isdiymemexp && diymemexp?.ParseExpMapResult != null)
+                {
                     parent.DbNestedField = diymemexp.ParseExpMapResult.DbNestedField;
+                    if (EndsWithDbNestedField(parent.DbField, $" {parent.DbNestedField}") == false && //#1510 group by 产生的 DbField 自带 alias，因此需要此行判断
+                        string.IsNullOrEmpty(parent.CsName) == false && localIndex == ReadAnonymousFieldAsCsName)
+                    {
+                        parent.DbNestedField = GetFieldAsCsName(parent.CsName);
+                        if (EndsWithDbNestedField(parent.DbField, parent.DbNestedField) == false) //DbField 和 CsName 相同的时候，不处理
+                            field.Append(_common.FieldAsAlias(parent.DbNestedField));
+                    }
+                }
                 else if (string.IsNullOrEmpty(parent.CsName) == false)
                 {
                     parent.DbNestedField = GetFieldAsCsName(parent.CsName);