From 61e35adc69c7e3168dea992df1a29eaca086ce55 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 6 Jun 2023 16:31:37 +0800 Subject: [PATCH] Synchronization code --- Src/Asp.Net/SqlSugar/Abstract/DynamicBuilder/Helper.cs | 6 ++++-- .../SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/DynamicBuilder/Helper.cs b/Src/Asp.Net/SqlSugar/Abstract/DynamicBuilder/Helper.cs index eef70f68a..a8cf8b4c0 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DynamicBuilder/Helper.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DynamicBuilder/Helper.cs @@ -71,7 +71,8 @@ namespace SqlSugar attributeType.GetProperty(nameof(SugarColumn.OldColumnName)), attributeType.GetProperty(nameof(SugarColumn.SqlParameterDbType)), attributeType.GetProperty(nameof(SugarColumn.SqlParameterSize)), - attributeType.GetProperty(nameof(SugarColumn.IsArray)) + attributeType.GetProperty(nameof(SugarColumn.IsArray)), + attributeType.GetProperty(nameof(SugarColumn.ColumnName)) } , new object[] { sugarTable.IsPrimaryKey, @@ -90,7 +91,8 @@ namespace SqlSugar sugarTable.OldColumnName, sugarTable.SqlParameterDbType, sugarTable.SqlParameterSize, - sugarTable.IsArray + sugarTable.IsArray, + sugarTable.ColumnName }); return attributeBuilder; } diff --git a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs index 45275c84a..47f1c1a03 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SugarProvider/SqlSugarProvider.cs @@ -419,6 +419,8 @@ namespace SqlSugar var newQueryable = this.SqlQueryable(sqlobj.Key).AddParameters(sqlobj.Value); var result = newQueryable.Select(newQueryable.QueryBuilder.SelectValue+""); result.QueryBuilder.IsSqlQuery = false; + result.QueryBuilder.NoCheckInclude = true; + result.QueryBuilder.Includes = queryable.QueryBuilder.Includes?.ToList(); return result; } public virtual ISugarQueryable Queryable( @@ -674,6 +676,7 @@ namespace SqlSugar var result= this.Context.Queryable().AS(sqlBuilder.GetPackTable(sql, sqlBuilder.GetDefaultShortName())).With(SqlWith.Null).Select(sqlBuilder.GetDefaultShortName() + ".*"); result.QueryBuilder.IsSqlQuery = true; result.QueryBuilder.OldSql = sql; + result.QueryBuilder.NoCheckInclude = true; return result; } #endregion