From 53347c49bb430865df284ba01535f352638b835e Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 7 Sep 2023 08:41:38 +0800 Subject: [PATCH] Add unit test --- .../QueryableProvider/QueryableHelper.cs | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs index 8a1455844..618a410b1 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableHelper.cs @@ -1297,9 +1297,9 @@ namespace SqlSugar var name = this.SqlBuilder.GetTranslationTableName(TableName); var columns = ""; sql = ""; - //var isSqlFunc = this.QueryBuilder.GetSelectValue?.Contains(")") == true && this.QueryBuilder.SelectValue is Expression; - //if (isSqlFunc) - //{ + var isSqlFunc = this.QueryBuilder.SelectValue is Expression; + if (isSqlFunc) + { columns = "("; foreach (var item in ExpressionTool.GetNewExpressionItemList((Expression)this.QueryBuilder.SelectValue)) { @@ -1313,21 +1313,21 @@ namespace SqlSugar } columns = columns.TrimEnd(',') + ")"; sql = $" INSERT INTO {name} {columns} " + sqlInfo.Key; - //} - //else - //{ - // if (this.QueryBuilder.GetSelectValue != null && this.QueryBuilder.GetSelectValue.Contains(",")) ; - // { - // columns = "("; - // foreach (var item in this.QueryBuilder.GetSelectValue.Split(',')) - // { - // var column = Regex.Split(item, " AS ").Last().Trim(); - // columns += $"{column},"; - // } - // columns = columns.TrimEnd(',') + ")"; - // } - // sql = $" INSERT INTO {name} {columns} " + sqlInfo.Key; - //} + } + else + { + if (this.QueryBuilder.GetSelectValue != null && this.QueryBuilder.GetSelectValue.Contains(",")) ; + { + columns = "("; + foreach (var item in this.QueryBuilder.GetSelectValue.Split(',')) + { + var column = Regex.Split(item, " AS ").Last().Trim(); + columns += $"{column},"; + } + columns = columns.TrimEnd(',') + ")"; + } + sql = $" INSERT INTO {name} {columns} " + sqlInfo.Key; + } } private string GetTableName(EntityInfo entity, string tableName)