From dc5adfc6a79654ea05eac19eca938669f2a9fef8 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sun, 21 May 2017 02:14:27 +0800 Subject: [PATCH] - --- OrmTest/UnitTest/Update.cs | 2 +- .../SqlBuilder/DMLBuilder/UpdateBuilder.cs | 36 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/OrmTest/UnitTest/Update.cs b/OrmTest/UnitTest/Update.cs index 541829f98..4009044e2 100644 --- a/OrmTest/UnitTest/Update.cs +++ b/OrmTest/UnitTest/Update.cs @@ -20,7 +20,7 @@ namespace OrmTest.UnitTest { var db = GetInstance(); var updateObj = new Student() { Id = 1, Name = "jack", CreateTime = DateTime.Now }; - var updateObjs = new List() { updateObj }.ToArray(); + var updateObjs = new List() { updateObj,new Student() { Id=2,Name="sun" } }.ToArray(); db.IgnoreColumns.Add("TestId", "Student"); //db.MappingColumns.Add("id","dbid", "Student"); diff --git a/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/UpdateBuilder.cs b/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/UpdateBuilder.cs index 1e39a82d8..aeccbee18 100644 --- a/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/UpdateBuilder.cs +++ b/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/UpdateBuilder.cs @@ -110,19 +110,21 @@ namespace SqlSugar { var groupList = DbColumnInfoList.GroupBy(it => it.TableId).ToList(); var isSingle = groupList.Count() == 1; - string columnsString = string.Join(",", groupList.First().Select(it => - { - if (SetValues.IsValuable()) { - var setValue = SetValues.Where(sv => sv.Key == Builder.GetTranslationColumnName(it.DbColumnName)); - if (setValue != null&& setValue.Any()) { - return setValue.First().Value; - } - } - var result = Builder.GetTranslationColumnName(it.DbColumnName) + "=" + this.Context.Ado.SqlParameterKeyWord + it.DbColumnName; - return result; - })); if (isSingle) { + string columnsString = string.Join(",", groupList.First().Select(it => + { + if (SetValues.IsValuable()) + { + var setValue = SetValues.Where(sv => sv.Key == Builder.GetTranslationColumnName(it.DbColumnName)); + if (setValue != null && setValue.Any()) + { + return setValue.First().Value; + } + } + var result = Builder.GetTranslationColumnName(it.DbColumnName) + "=" + this.Context.Ado.SqlParameterKeyWord + it.DbColumnName; + return result; + })); string whereString = null; if (this.WhereValues.IsValuable()) { @@ -148,29 +150,29 @@ namespace SqlSugar { Check.Exception(PrimaryKeys == null || PrimaryKeys.Count == 0, " Update List need Primary key"); var whereString = string.Join(",", PrimaryKeys.Select(it => string.Format("T.{0}=S.{0}", Builder.GetTranslationColumnName(it)))); - StringBuilder batchInsetrSql = new StringBuilder(); + StringBuilder batchUpdateSql = new StringBuilder(); int pageSize = 200; int pageIndex = 1; int totalRecord = groupList.Count; int pageCount = (totalRecord + pageSize - 1) / pageSize; while (pageCount >= pageIndex) { - batchInsetrSql.AppendFormat(SqlTemplateBatch, GetTableNameString, columnsString); + batchUpdateSql.AppendFormat(SqlTemplateBatch, GetTableNameString, ""); int i = 0; foreach (var columns in groupList.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList()) { var isFirst = i == 0; if (!isFirst) { - batchInsetrSql.Append(SqlTemplateBatchUnion); + batchUpdateSql.Append(SqlTemplateBatchUnion); } - batchInsetrSql.Append("\r\n SELECT " + string.Join(",", columns.Select(it => string.Format(SqlTemplateBatchSelect, FormatValue(it.Value), it.DbColumnName)))); + batchUpdateSql.Append("\r\n SELECT " + string.Join(",", columns.Select(it => string.Format(SqlTemplateBatchSelect, FormatValue(it.Value), it.DbColumnName)))); ++i; } pageIndex++; - batchInsetrSql.Append("\r\nGO\r\n"); + batchUpdateSql.Append("\r\nGO\r\n"); } - return batchInsetrSql.ToString(); + return batchUpdateSql.ToString(); } }