From 8bc3b0e75d3ab6bc7b0f7349ed8125425e9ff390 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 26 Sep 2022 16:23:01 +0800 Subject: [PATCH] Synchronization code --- .../Abstract/QueryableProvider/QueryableProvider.cs | 7 ++++++- .../SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index de9470d0e..db49b983d 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -1076,7 +1076,7 @@ namespace SqlSugar { var dbColumnName = firstColumn.DbColumnName; var AsName = item.PropertyName; - sb.Append($"{this.SqlBuilder.GetTranslationColumnName(dbColumnName)} AS {AsName} ,"); + sb.Append($"{this.SqlBuilder.GetTranslationColumnName(dbColumnName)} AS {this.SqlBuilder.GetTranslationColumnName(AsName)} ,"); } } selects = sb.ToString().TrimEnd(','); @@ -2588,6 +2588,10 @@ namespace SqlSugar { result.WithCache(this.CacheTime); } + if (this.QueryBuilder.IsSqlQuery) + { + this.QueryBuilder.IsSqlQuerySelect = true; + } return result; } protected void _Where(Expression expression) @@ -3546,6 +3550,7 @@ namespace SqlSugar asyncQueryableBuilder.DisableTop = this.QueryBuilder.DisableTop; asyncQueryableBuilder.Offset = this.QueryBuilder.Offset; asyncQueryableBuilder.IsSqlQuery = this.QueryBuilder.IsSqlQuery; + asyncQueryableBuilder.IsSqlQuerySelect = this.QueryBuilder.IsSqlQuerySelect; asyncQueryableBuilder.OldSql = this.QueryBuilder.OldSql; } protected int SetCacheTime(int cacheDurationInSeconds) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 98832a2f2..2e547c086 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -42,6 +42,7 @@ namespace SqlSugar public List IgnoreColumns { get; set; } public bool IsCount { get; set; } public bool IsSqlQuery { get; set; } + public bool IsSqlQuerySelect { get; set; } public int? Skip { get; set; } public int ExternalPageIndex { get; set; } public int ExternalPageSize { get; set; } @@ -557,6 +558,10 @@ namespace SqlSugar result = "-- No table "; return result; } + if (this.IsSqlQuerySelect == true) + { + return result; + } if (this.IsSqlQuery&&this.OldSql.HasValue() && (Skip == null && Take == null) && (this.WhereInfos == null || this.WhereInfos.Count == 0)) { return this.OldSql;