From 00c57e4b4587beaea822e8618590b4292c600b9c Mon Sep 17 00:00:00 2001 From: skx <610262374@qq.com> Date: Sat, 16 Jan 2021 23:22:13 +0800 Subject: [PATCH] Delete obsolete --- .../UpdateProvider/UpdateableProvider.cs | 63 +------------------ Src/Asp.Net/SqlSugar/Interface/IUpdateable.cs | 23 +------ 2 files changed, 2 insertions(+), 84 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs index 44d27eeaf..247c292d5 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs @@ -315,68 +315,7 @@ namespace SqlSugar return this; } - - - - #region delete obj - [Obsolete] - public IUpdateable UpdateColumns(Expression> columns) - { - return this.SetColumns(columns); - } - [Obsolete] - public IUpdateable UpdateColumns(Expression> columns) - { - return this.SetColumns(columns); - } - [Obsolete] - public IUpdateable UpdateColumnsIF(bool isUpdateColumns, Expression> columns) - { - return this.SetColumnsIF(isUpdateColumns, columns); - } - [Obsolete] - public IUpdateable UpdateColumnsIF(bool isUpdateColumns, Expression> columns) - { - return this.SetColumnsIF(isUpdateColumns, columns); - } - [Obsolete] - public IUpdateable UpdateColumnsIF(bool isUpdateColumns, Func updateColumMethod) - { - if (isUpdateColumns) - UpdateColumns(updateColumMethod); - return this; - } - [Obsolete] - public IUpdateable UpdateColumns(Func updateColumMethod) - { - List primaryKeys = GetPrimaryKeys(); - foreach (var item in this.UpdateBuilder.DbColumnInfoList) - { - var mappingInfo = primaryKeys.SingleOrDefault(i => item.DbColumnName.Equals(i, StringComparison.CurrentCultureIgnoreCase)); - if (mappingInfo != null && mappingInfo.Any()) - { - item.IsPrimarykey = true; - } - } - this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => updateColumMethod(it.PropertyName) || it.IsPrimarykey || it.IsIdentity).ToList(); - return this; - } - [Obsolete] - public IUpdateable IgnoreColumns(Func ignoreColumMethod) - { - this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => !ignoreColumMethod(it.PropertyName)).ToList(); - return this; - } - [Obsolete("Use IUpdateable IgnoreColumns(bool ignoreAllNullColumns, bool isOffIdentity = false);")] - public IUpdateable Where(bool isUpdateNull, bool IsOffIdentity = false) - { - UpdateBuilder.IsOffIdentity = IsOffIdentity; - if (this.UpdateBuilder.LambdaExpressions == null) - this.UpdateBuilder.LambdaExpressions = InstanceFactory.GetLambdaExpressions(this.Context.CurrentConnectionConfig); - this.UpdateBuilder.IsNoUpdateNull = isUpdateNull; - return this; - } - #endregion + #region Helper private void AppendSets() diff --git a/Src/Asp.Net/SqlSugar/Interface/IUpdateable.cs b/Src/Asp.Net/SqlSugar/Interface/IUpdateable.cs index 489c96200..82dd5f3d5 100644 --- a/Src/Asp.Net/SqlSugar/Interface/IUpdateable.cs +++ b/Src/Asp.Net/SqlSugar/Interface/IUpdateable.cs @@ -89,27 +89,6 @@ namespace SqlSugar IUpdateable RemoveDataCache(); KeyValuePair> ToSql(); void AddQueue(); - - - #region delete obj - - [Obsolete("Use IUpdateable UpdateColumns(string [] columns)")] - IUpdateable UpdateColumns(Func updateColumMethod); - [Obsolete("Use IUpdateable IgnoreColumns(string [] columns)")] - IUpdateable IgnoreColumns(Func ignoreColumMethod); - [Obsolete("Use IUpdateable IgnoreColumns(bool ignoreAllNullColumns, bool isOffIdentity = false);")] - IUpdateable Where(bool isNoUpdateNull, bool IsOffIdentity = false); - [Obsolete("Use IUpdateable UpdateColumnsIF(bool isUpdateColumns,string [] columns")] - IUpdateable UpdateColumnsIF(bool isUpdateColumns, Func updateColumMethod); - [Obsolete("Use SetColumns(Expression> columns)")] - IUpdateable UpdateColumns(Expression> columns); - [Obsolete("Use SetColumns(Expression> columns")] - IUpdateable UpdateColumns(Expression> columns); - - [Obsolete("Use SetColumnsIF(bool isUpdateColumns, Expression> columns)")] - IUpdateable UpdateColumnsIF(bool isUpdateColumns, Expression> columns); - [Obsolete("Use SetColumnsIF(bool isUpdateColumns, Expression> columns")] - IUpdateable UpdateColumnsIF(bool isUpdateColumns, Expression> columns); - #endregion + } }