From ac961ae4a4206757fc33602d588ff4eeab967f25 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Fri, 21 Jul 2023 15:18:47 +0800 Subject: [PATCH] Synchronization code --- .../QueryableProvider02-05.cs | 30 ------------------- .../SplitTableUpdateProvider.cs | 16 ++++++++++ 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs index 10171bb0f..65ded1e71 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs @@ -361,16 +361,6 @@ namespace SqlSugar } return this; } - - public new virtual ISugarQueryable GroupByIF(bool isGroupBy, string groupFields) - { - if (isGroupBy) - { - GroupBy(groupFields); - } - return this; - } - public new virtual ISugarQueryable HavingIF(bool isHaving, Expression> expression) { if (isHaving) @@ -865,16 +855,6 @@ namespace SqlSugar } return this; } - - public new virtual ISugarQueryable GroupByIF(bool isGroupBy, string groupFields) - { - if (isGroupBy) - { - GroupBy(groupFields); - } - return this; - } - public ISugarQueryable GroupBy(Expression> expression) { _GroupBy(expression); @@ -1783,16 +1763,6 @@ namespace SqlSugar } return this; } - - public new virtual ISugarQueryable GroupByIF(bool isGroupBy, string groupFields) - { - if (isGroupBy) - { - GroupBy(groupFields); - } - return this; - } - public new ISugarQueryable GroupBy(Expression> expression) { _GroupBy(expression); diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/UpdateProvider/SplitTableUpdateProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/UpdateProvider/SplitTableUpdateProvider.cs index f6b9bc262..6e53c3c5a 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/UpdateProvider/SplitTableUpdateProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/UpdateProvider/SplitTableUpdateProvider.cs @@ -14,6 +14,14 @@ namespace SqlSugar public IEnumerable Tables { get; set; } + public int ExecuteCommandWithOptLock(bool isThrowError = false) + { + var updates=updateobj.UpdateObjs; + var tableName = this.Context.SplitHelper(updates.FirstOrDefault()).GetTableName(); + var names=updateobj.UpdateBuilder.DbColumnInfoList.Select(it => it.DbColumnName).Distinct().ToArray(); + return this.Context.Updateable(updates).AS(tableName) + .UpdateColumns(names).ExecuteCommandWithOptLock(isThrowError); + } public int ExecuteCommand() { if (this.Context.Ado.Transaction == null) @@ -36,6 +44,14 @@ namespace SqlSugar return _ExecuteCommand(); } } + public async Task ExecuteCommandWithOptLockAsync(bool isThrowError = false) + { + var updates = updateobj.UpdateObjs; + var tableName = this.Context.SplitHelper(updates.FirstOrDefault()).GetTableName(); + var names = updateobj.UpdateBuilder.DbColumnInfoList.Select(it => it.DbColumnName).Distinct().ToArray(); + return await this.Context.Updateable(updates).AS(tableName) + .UpdateColumns(names).ExecuteCommandWithOptLockAsync(isThrowError); + } public async Task ExecuteCommandAsync() { if (this.Context.Ado.Transaction == null)