From 3e60f8465f3d8b8a760356fb4274b7fed84cb259 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 22 Jun 2017 21:30:53 +0800 Subject: [PATCH] Update Deleteable --- .../DeleteProvider/DeleteableProvider.cs | 24 +++++++++++++++---- Src/Asp.Net/SqlSugar/Interface/IDeleteable.cs | 3 +++ .../DeleteProvider/DeleteableProvider.cs | 15 ++++++++++++ .../src/SqlSugar/Interface/IDeleteable.cs | 3 +++ 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index 5bf1030cd..57f1dadb3 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -26,7 +26,7 @@ namespace SqlSugar { DeleteBuilder.EntityInfo = this.Context.EntityProvider.GetEntityInfo(); string sql = DeleteBuilder.ToSqlString(); - var paramters = DeleteBuilder.Parameters==null?null:DeleteBuilder.Parameters.ToArray(); + var paramters = DeleteBuilder.Parameters == null ? null : DeleteBuilder.Parameters.ToArray(); RestoreMapping(); return Db.ExecuteCommand(sql, paramters); } @@ -63,7 +63,7 @@ namespace SqlSugar primaryKeyValues.Add(value); } var inValueString = primaryKeyValues.ToArray().ToJoinSqlInVals(); - Where(string.Format(DeleteBuilder.WhereInTemplate,SqlBuilder.GetTranslationColumnName(primaryFields.Single()), inValueString)); + Where(string.Format(DeleteBuilder.WhereInTemplate, SqlBuilder.GetTranslationColumnName(primaryFields.Single()), inValueString)); } else { @@ -114,7 +114,8 @@ namespace SqlSugar DeleteBuilder.WhereInfos.Add(whereString); if (parameters != null) { - if (DeleteBuilder.Parameters == null) { + if (DeleteBuilder.Parameters == null) + { DeleteBuilder.Parameters = new List(); } DeleteBuilder.Parameters.AddRange(Context.Ado.GetParameters(parameters)); @@ -122,6 +123,21 @@ namespace SqlSugar return this; } + public IDeleteable Where(string whereString, SugarParameter parameter) + { + DeleteBuilder.Parameters.Add(parameter); + return this; + } + public IDeleteable Where(string whereString, SugarParameter[] parameters) + { + DeleteBuilder.Parameters.AddRange(parameters); + return this; + } + public IDeleteable Where(string whereString, List parameters) + { + DeleteBuilder.Parameters.AddRange(parameters); + return this; + } public IDeleteable In(List primaryKeyValues) { if (primaryKeyValues == null || primaryKeyValues.Count() == 0) @@ -143,7 +159,7 @@ namespace SqlSugar string primaryField = null; primaryField = GetPrimaryKeys().FirstOrDefault(); Check.ArgumentNullException(primaryField, "Table " + tableName + " with no primarykey"); - Where(string.Format(DeleteBuilder.WhereInTemplate,SqlBuilder.GetTranslationColumnName(primaryField), primaryKeyValues.ToJoinSqlInVals())); + Where(string.Format(DeleteBuilder.WhereInTemplate, SqlBuilder.GetTranslationColumnName(primaryField), primaryKeyValues.ToJoinSqlInVals())); return this; } diff --git a/Src/Asp.Net/SqlSugar/Interface/IDeleteable.cs b/Src/Asp.Net/SqlSugar/Interface/IDeleteable.cs index 1885b80a9..8ccac6cee 100644 --- a/Src/Asp.Net/SqlSugar/Interface/IDeleteable.cs +++ b/Src/Asp.Net/SqlSugar/Interface/IDeleteable.cs @@ -19,6 +19,9 @@ namespace SqlSugar IDeleteable In(PkType[] primaryKeyValues); IDeleteable In(List primaryKeyValues); IDeleteable Where(string whereString,object parameters=null); + IDeleteable Where(string whereString, SugarParameter parameter); + IDeleteable Where(string whereString, SugarParameter[] parameters); + IDeleteable Where(string whereString, List parameters); KeyValuePair> ToSql(); } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index eb0d3e40b..57f1dadb3 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -123,6 +123,21 @@ namespace SqlSugar return this; } + public IDeleteable Where(string whereString, SugarParameter parameter) + { + DeleteBuilder.Parameters.Add(parameter); + return this; + } + public IDeleteable Where(string whereString, SugarParameter[] parameters) + { + DeleteBuilder.Parameters.AddRange(parameters); + return this; + } + public IDeleteable Where(string whereString, List parameters) + { + DeleteBuilder.Parameters.AddRange(parameters); + return this; + } public IDeleteable In(List primaryKeyValues) { if (primaryKeyValues == null || primaryKeyValues.Count() == 0) diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IDeleteable.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IDeleteable.cs index eb2dda363..4b9614a4a 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IDeleteable.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IDeleteable.cs @@ -19,6 +19,9 @@ namespace SqlSugar IDeleteable In(PkType[] primaryKeyValues); IDeleteable In(List primaryKeyValues); IDeleteable Where(string whereString, object parameters = null); + IDeleteable Where(string whereString, SugarParameter parameter); + IDeleteable Where(string whereString, SugarParameter[] parameters); + IDeleteable Where(string whereString, List parameters); KeyValuePair> ToSql(); } }