From d80ce8c345d6e929a35b9c0c022358708af45021 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 17 May 2017 01:19:36 +0800 Subject: [PATCH] - --- .../DeleteProvider/DeleteableProvider.cs | 17 ++++++++++------- SqlSugar/InstanceFactory.cs | 2 +- .../Core/SqlBuilder/SqlServerDeleteBuilder.cs | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index d9544d68b..33491efde 100644 --- a/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -54,9 +54,10 @@ namespace SqlSugar foreach (var deleteObj in deleteObjs) { StringBuilder orString = new StringBuilder(); - var isFirst = deleteObjs.IndexOf(deleteObj)==0; - if (isFirst) { - orString.Append(DeleteBuilder.WhereInOrTemplate+PubConst.Space); + var isFirst = deleteObjs.IndexOf(deleteObj) == 0; + if (isFirst) + { + orString.Append(DeleteBuilder.WhereInOrTemplate + PubConst.Space); } int i = 0; StringBuilder andString = new StringBuilder(); @@ -70,10 +71,10 @@ namespace SqlSugar andString.AppendFormat(DeleteBuilder.WhereInEqualTemplate, primaryField, entityValue); ++i; } - orString.AppendFormat(DeleteBuilder.WhereInAreaTemplate,andString); + orString.AppendFormat(DeleteBuilder.WhereInAreaTemplate, andString); whereInSql.Append(orString); } - Where(string.Format(DeleteBuilder.WhereInAreaTemplate,whereInSql.ToString())); + Where(string.Format(DeleteBuilder.WhereInAreaTemplate, whereInSql.ToString())); } } else @@ -105,7 +106,8 @@ namespace SqlSugar } return this; } - public IDeleteable In(List primaryKeyValues) { + public IDeleteable In(List primaryKeyValues) + { if (primaryKeyValues == null || primaryKeyValues.Count() == 0) { Where("1=2 "); @@ -149,8 +151,9 @@ namespace SqlSugar public KeyValuePair> ToSql() { + DeleteBuilder.TableName = this.Context.GetTableName(); string sql = DeleteBuilder.ToSqlString(); - var paramters = DeleteBuilder.Parameters.ToList(); + var paramters = DeleteBuilder.Parameters == null ? null : DeleteBuilder.Parameters.ToList(); return new KeyValuePair>(sql, paramters); } } diff --git a/SqlSugar/InstanceFactory.cs b/SqlSugar/InstanceFactory.cs index 3fbc4c269..000985e6f 100644 --- a/SqlSugar/InstanceFactory.cs +++ b/SqlSugar/InstanceFactory.cs @@ -89,7 +89,7 @@ namespace SqlSugar public static IDb GetDb(IConnectionConfig currentConnectionConfig) { CheckConfig(currentConnectionConfig); - IDb reval = CreateInstance(GetClassName(currentConnectionConfig.DbType, "Db"), currentConnectionConfig.DbType); + IDb reval = CreateInstance(GetClassName(currentConnectionConfig.DbType, "Provider"), currentConnectionConfig.DbType); return reval; } diff --git a/SqlSugar/Realization/SqlServer/Core/SqlBuilder/SqlServerDeleteBuilder.cs b/SqlSugar/Realization/SqlServer/Core/SqlBuilder/SqlServerDeleteBuilder.cs index 1f171f735..516e451b7 100644 --- a/SqlSugar/Realization/SqlServer/Core/SqlBuilder/SqlServerDeleteBuilder.cs +++ b/SqlSugar/Realization/SqlServer/Core/SqlBuilder/SqlServerDeleteBuilder.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace SqlSugar { - public class SqlServerDeleteBuilder:DeleteableProvider where T:class,new() + public class SqlServerDeleteBuilder: DeleteBuilder { }