From 65844b5cc8ef018336d7700430a6adbd3672ac82 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 22 May 2017 01:38:44 +0800 Subject: [PATCH] - --- .../Abstract/Core/SqlBuilder/DMLBuilder/DeleteBuilder.cs | 5 ++--- SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs | 7 +++++-- SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs | 1 + SqlSugar/SqlSugarClient.cs | 1 - 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/DeleteBuilder.cs b/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/DeleteBuilder.cs index c13b7312f..33c44895e 100644 --- a/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/DeleteBuilder.cs +++ b/SqlSugar/Abstract/Core/SqlBuilder/DMLBuilder/DeleteBuilder.cs @@ -8,13 +8,12 @@ namespace SqlSugar public class DeleteBuilder : IDMLBuilder { private List _WhereInfos; - + public EntityInfo EntityInfo { get; set; } public SqlSugarClient Context { get; set; } public ILambdaExpressions LambdaExpressions { get; set; } public List Parameters { get; set; } public StringBuilder sql { get; set; } public ISqlBuilder Builder { get; set; } - public string TableName { get; set; } public string TableWithString { get; set; } public virtual List WhereInfos { @@ -75,7 +74,7 @@ namespace SqlSugar { get { - var result = Builder.GetTranslationTableName(TableName); + var result = Builder.GetTranslationTableName(EntityInfo.EntityName); result += PubConst.Space; if (this.TableWithString.IsValuable()) { diff --git a/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs b/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs index 7f283df3e..19b9721ab 100644 --- a/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -22,8 +22,9 @@ namespace SqlSugar } public int ExecuteCommand() { + DeleteBuilder.EntityInfo = this.Context.EntityProvider.GetEntityInfo(); string sql = DeleteBuilder.ToSqlString(); - var paramters = DeleteBuilder.Parameters.ToArray(); + var paramters = DeleteBuilder.Parameters==null?null:DeleteBuilder.Parameters.ToArray(); return Db.GetInt(sql, paramters); } @@ -105,6 +106,7 @@ namespace SqlSugar } return this; } + public IDeleteable In(List primaryKeyValues) { if (primaryKeyValues == null || primaryKeyValues.Count() == 0) @@ -114,6 +116,7 @@ namespace SqlSugar } return In(primaryKeyValues.ToArray()); } + public IDeleteable In(PkType[] primaryKeyValues) { if (primaryKeyValues == null || primaryKeyValues.Count() == 0) @@ -143,7 +146,7 @@ namespace SqlSugar public KeyValuePair> ToSql() { - DeleteBuilder.TableName = this.Context.EntityProvider.GetTableName(); + DeleteBuilder.EntityInfo = this.Context.EntityProvider.GetEntityInfo(); string sql = DeleteBuilder.ToSqlString(); var paramters = DeleteBuilder.Parameters == null ? null : DeleteBuilder.Parameters.ToList(); return new KeyValuePair>(sql, paramters); diff --git a/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index a29992648..be2b7b07f 100644 --- a/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -124,6 +124,7 @@ namespace SqlSugar } internal void Init() { + InsertBuilder.EntityInfo = this.EntityInfo; Check.Exception(InsertObjs == null || InsertObjs.Count() == 0, "InsertObjs is null"); int i = 0; foreach (var item in InsertObjs) diff --git a/SqlSugar/SqlSugarClient.cs b/SqlSugar/SqlSugarClient.cs index b44e30512..1506b6f93 100644 --- a/SqlSugar/SqlSugarClient.cs +++ b/SqlSugar/SqlSugarClient.cs @@ -253,7 +253,6 @@ namespace SqlSugar sqlBuilder.InsertBuilder.LambdaExpressions = InstanceFactory.GetLambdaExpressions(base.CurrentConnectionConfig); sqlBuilder.Context = reval.SqlBuilder.InsertBuilder.Context = this; reval.Init(); - reval.InsertBuilder.EntityInfo = reval.EntityInfo; return reval; } public virtual IInsertable Insertable(List insertObjs) where T : class, new()