From 25f025fd78dfb11963f3bdde03e92ded3978b67f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 7 Aug 2017 13:31:18 +0800 Subject: [PATCH] 4.2.3.1 --- .../Abstract/AdoProvider/AdoProvider.cs | 6 ++-- .../DeleteProvider/DeleteableProvider.cs | 28 ++++++++++++--- .../Abstract/EntityProvider/EntityProvider.cs | 6 +++- .../InsertableProvider/InsertableProvider.cs | 15 ++++++-- .../SqlBuilderProvider/DeleteBuilder.cs | 26 +++++++++++++- .../SqlBuilderProvider/QueryBuilder.cs | 2 +- .../UpdateProvider/UpdateableProvider.cs | 36 ++++++++++++++----- .../src/SqlSugar/Common/RewritableMethods.cs | 3 +- .../Common/ExpressionResult.cs | 19 +++++++--- .../ExpressionsToSql/Common/SugarParameter.cs | 9 +++++ .../Method/DefaultDbMethod.cs | 9 ++++- .../src/SqlSugar/Interface/IUpdateable.cs | 6 ++++ .../src/SqlSugar/Interface/Insertable.cs | 3 +- .../src/SqlSugar/SimpleClient.cs | 2 +- .../src/SqlSugar/SqlSugarForCore.nuspec | 2 +- 15 files changed, 142 insertions(+), 30 deletions(-) diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/AdoProvider/AdoProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/AdoProvider/AdoProvider.cs index 2e5472dc5..f8071fcfd 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/AdoProvider/AdoProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/AdoProvider/AdoProvider.cs @@ -302,7 +302,7 @@ namespace SqlSugar } public virtual Double GetDouble(string sql, params SugarParameter[] parameters) { - return Convert.ToDouble(GetScalar(sql, parameters)); + return GetScalar(sql, parameters).ObjToMoney(); } public virtual Double GetDouble(string sql, List parameters) { @@ -321,7 +321,7 @@ namespace SqlSugar } public virtual decimal GetDecimal(string sql, params SugarParameter[] parameters) { - return Convert.ToDecimal(GetScalar(sql, parameters)); + return GetScalar(sql, parameters).ObjToDecimal(); } public virtual decimal GetDecimal(string sql, List parameters) { @@ -340,7 +340,7 @@ namespace SqlSugar } public virtual DateTime GetDateTime(string sql, params SugarParameter[] parameters) { - return Convert.ToDateTime(GetScalar(sql, parameters)); + return GetScalar(sql, parameters).ObjToDate(); } public virtual DateTime GetDateTime(string sql, List parameters) { 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 79ed4b33c..37ee1ed49 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DeleteProvider/DeleteableProvider.cs @@ -58,12 +58,22 @@ namespace SqlSugar foreach (var deleteObj in deleteObjs) { var entityPropertyName = this.Context.EntityProvider.GetPropertyName(primaryField); - var columnInfo = EntityInfo.Columns.Single(it => it.PropertyName.Equals(entityPropertyName,StringComparison.CurrentCultureIgnoreCase)); + var columnInfo = EntityInfo.Columns.Single(it => it.PropertyName.Equals(entityPropertyName, StringComparison.CurrentCultureIgnoreCase)); var value = columnInfo.PropertyInfo.GetValue(deleteObj, null); primaryKeyValues.Add(value); } - var inValueString = primaryKeyValues.ToArray().ToJoinSqlInVals(); - Where(string.Format(DeleteBuilder.WhereInTemplate, SqlBuilder.GetTranslationColumnName(primaryFields.Single()), inValueString)); + if (primaryKeyValues.Count < 10000) + { + var inValueString = primaryKeyValues.ToArray().ToJoinSqlInVals(); + Where(string.Format(DeleteBuilder.WhereInTemplate, SqlBuilder.GetTranslationColumnName(primaryFields.Single()), inValueString)); + } + else + { + if (DeleteBuilder.BigDataInValues == null) + DeleteBuilder.BigDataInValues = new List(); + DeleteBuilder.BigDataInValues.AddRange(primaryKeyValues); + DeleteBuilder.BigDataFiled = primaryField; + } } else { @@ -159,7 +169,17 @@ 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())); + if (primaryKeyValues.Length < 10000) + { + Where(string.Format(DeleteBuilder.WhereInTemplate, SqlBuilder.GetTranslationColumnName(primaryField), primaryKeyValues.ToJoinSqlInVals())); + } + else + { + if (DeleteBuilder.BigDataInValues == null) + DeleteBuilder.BigDataInValues = new List(); + DeleteBuilder.BigDataInValues.AddRange(primaryKeyValues.Select(it=>(object)it)); + DeleteBuilder.BigDataFiled = primaryField; + } return this; } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs index 987b57819..25020d911 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs @@ -100,7 +100,11 @@ namespace SqlSugar return mappingInfo == null ? dbColumnName : mappingInfo.DbColumnName; } } - + public PropertyInfo GetProperty(string dbColumnName) + { + var propertyName = GetPropertyName(dbColumnName); + return typeof(T).GetProperties().First(it => it.Name == propertyName); + } #region Primary key private static void SetColumns(EntityInfo result) { diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index 54962acff..a3b3c7edf 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -45,7 +45,7 @@ namespace SqlSugar RestoreMapping(); return new KeyValuePair>(sql, InsertBuilder.Parameters); } - public int ExecuteReutrnIdentity() + public int ExecuteReturnIdentity() { InsertBuilder.IsReturnIdentity = true; PreToSql(); @@ -53,6 +53,17 @@ namespace SqlSugar RestoreMapping(); return Ado.GetInt(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); } + public T ExecuteReturnEntity() + { + var result = InsertObjs.First(); + var identityKeys=GetIdentityKeys(); + if (identityKeys.Count == 0) return result; + var idValue = ExecuteReturnIdentity(); + Check.Exception(identityKeys.Count > 1, "ExecuteReutrnEntity does not support multiple identity keys"); + var identityKey = identityKeys.First(); + this.Context.EntityProvider.GetProperty(identityKey).SetValue(result,idValue,null); + return result; + } #endregion #region Setting @@ -79,7 +90,7 @@ namespace SqlSugar public IInsertable InsertColumns(Expression> columns) { - var ignoreColumns = InsertBuilder.GetExpressionValue(columns, ResolveExpressType.ArraySingle).GetResultArray().Select(it=>this.SqlBuilder.GetNoTranslationColumnName(it)).ToList(); + var ignoreColumns = InsertBuilder.GetExpressionValue(columns, ResolveExpressType.ArraySingle).GetResultArray().Select(it => this.SqlBuilder.GetNoTranslationColumnName(it)).ToList(); this.InsertBuilder.DbColumnInfoList = this.InsertBuilder.DbColumnInfoList.Where(it => ignoreColumns.Contains(it.PropertyName)).ToList(); return this; } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs index 3fb867aa7..88b115dd8 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/DeleteBuilder.cs @@ -28,6 +28,8 @@ namespace SqlSugar } set { _WhereInfos = value; } } + public virtual List BigDataInValues { get; set; } + public virtual string BigDataFiled { get; set; } #endregion #region Sql Template @@ -115,7 +117,29 @@ namespace SqlSugar } public virtual string ToSqlString() { - return string.Format(SqlTemplate, GetTableNameString, GetWhereString); + if (this.BigDataInValues.IsNullOrEmpty()) + { + return string.Format(SqlTemplate, GetTableNameString, GetWhereString); + } + else//big data + { + var whereString = GetWhereString; + var sql = string.Format(SqlTemplate, GetTableNameString, whereString); + sql += whereString.IsNullOrEmpty() ? " WHERE " : " AND "; + StringBuilder batchDeleteSql = new StringBuilder(); + int pageSize = 1000; + int pageIndex = 1; + int totalRecord = this.BigDataInValues.Count; + int pageCount = (totalRecord + pageSize - 1) / pageSize; + while (pageCount >= pageIndex) + { + var inValues = this.BigDataInValues.Skip((pageIndex - 1) * pageSize).Take(pageSize).ToList(); + batchDeleteSql.Append(sql+string.Format(WhereInTemplate,BigDataFiled,inValues.ToArray().ToJoinSqlInVals())); + batchDeleteSql.Append(";"); + pageIndex++; + } + return batchDeleteSql.ToString(); + } } public virtual ExpressionResult GetExpressionValue(Expression expression, ResolveExpressType resolveType) { diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs index 7e3ba6f72..7210640aa 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/SqlBuilderProvider/QueryBuilder.cs @@ -306,7 +306,7 @@ namespace SqlSugar return string.Format( this.JoinTemplate, joinInfo.JoinType.ToString() + PubConst.Space, - joinInfo.TableName + PubConst.Space, + Builder.GetTranslationTableName(joinInfo.TableName) + PubConst.Space, joinInfo.ShortName + PubConst.Space + joinInfo.TableWithString, joinInfo.JoinWhere); } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs index c96912441..1e8448c48 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/UpdateProvider/UpdateableProvider.cs @@ -21,6 +21,7 @@ namespace SqlSugar public bool IsSingle { get { return this.UpdateObjs.Length == 1; } } public List MappingColumnList { get; set; } private List IgnoreColumnNameList { get; set; } + private List WhereColumnList { get; set; } private bool IsOffIdentity { get; set; } public MappingTableList OldMappingTableList { get; set; } public bool IsAs { get; set; } @@ -75,6 +76,17 @@ namespace SqlSugar return new KeyValuePair>(sql, UpdateBuilder.Parameters); } + public IUpdateable WhereColumns(Expression> columns) + { + var whereColumns = UpdateBuilder.GetExpressionValue(columns, ResolveExpressType.ArraySingle).GetResultArray().Select(it => this.SqlBuilder.GetNoTranslationColumnName(it)).ToList(); + if (this.WhereColumnList == null) this.WhereColumnList = new List(); + foreach (var item in whereColumns) + { + this.WhereColumnList.Add(this.Context.EntityProvider.GetDbColumnName(item)); + } + return this; + } + public IUpdateable UpdateColumns(Expression> columns) { var updateColumns = UpdateBuilder.GetExpressionValue(columns, ResolveExpressType.ArraySingle).GetResultArray().Select(it => this.SqlBuilder.GetNoTranslationColumnName(it)).ToList(); @@ -91,7 +103,8 @@ namespace SqlSugar return this; } - public IUpdateable UpdateColumns(Func updateColumMethod) { + public IUpdateable UpdateColumns(Func updateColumMethod) + { List primaryKeys = GetPrimaryKeys(); foreach (var item in this.UpdateBuilder.DbColumnInfoList) { @@ -101,22 +114,23 @@ namespace SqlSugar item.IsPrimarykey = true; } } - this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => updateColumMethod(it.PropertyName) || it.IsPrimarykey ||it.IsIdentity).ToList(); + this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => updateColumMethod(it.PropertyName) || it.IsPrimarykey || it.IsIdentity).ToList(); return this; } public IUpdateable UpdateColumns(Expression> columns) { var expResult = UpdateBuilder.GetExpressionValue(columns, ResolveExpressType.Update); - var resultArray=expResult.GetResultArray(); + var resultArray = expResult.GetResultArray(); Check.ArgumentNullException(resultArray, "UpdateColumns Parameter error, UpdateColumns(it=>new T{ it.id=1}) is valid, UpdateColumns(it=>T) is error"); - if (resultArray.IsValuable()) { + if (resultArray.IsValuable()) + { foreach (var item in resultArray) { string key = SqlBuilder.GetNoTranslationColumnName(item); UpdateBuilder.SetValues.Add(new KeyValuePair(SqlBuilder.GetTranslationColumnName(key), item)); } } - this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => UpdateBuilder.SetValues.Any(v=> SqlBuilder.GetNoTranslationColumnName(v.Key) ==it.DbColumnName) || it.IsPrimarykey == true).ToList(); + this.UpdateBuilder.DbColumnInfoList = this.UpdateBuilder.DbColumnInfoList.Where(it => UpdateBuilder.SetValues.Any(v => SqlBuilder.GetNoTranslationColumnName(v.Key) == it.DbColumnName) || it.IsPrimarykey == true).ToList(); return this; } @@ -164,7 +178,7 @@ namespace SqlSugar Value = column.PropertyInfo.GetValue(item, null), DbColumnName = GetDbColumnName(column.PropertyName), PropertyName = column.PropertyName, - PropertyType=PubMethod.GetUnderType(column.PropertyInfo), + PropertyType = PubMethod.GetUnderType(column.PropertyInfo), TableId = i }; if (columnInfo.PropertyType.IsEnum()) @@ -195,7 +209,7 @@ namespace SqlSugar foreach (var item in this.UpdateBuilder.DbColumnInfoList) { if (this.UpdateBuilder.Parameters == null) this.UpdateBuilder.Parameters = new List(); - this.UpdateBuilder.Parameters.Add(new SugarParameter(this.SqlBuilder.SqlParameterKeyWord + item.DbColumnName, item.Value,item.PropertyType)); + this.UpdateBuilder.Parameters.Add(new SugarParameter(this.SqlBuilder.SqlParameterKeyWord + item.DbColumnName, item.Value, item.PropertyType)); } } @@ -225,8 +239,9 @@ namespace SqlSugar } }); } - if (this.UpdateBuilder.Parameters.IsValuable()&&this.UpdateBuilder.SetValues.IsValuable()) { - this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v =>(SqlBuilder.SqlParameterKeyWord+SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName)); + if (this.UpdateBuilder.Parameters.IsValuable() && this.UpdateBuilder.SetValues.IsValuable()) + { + this.UpdateBuilder.Parameters.RemoveAll(it => this.UpdateBuilder.SetValues.Any(v => (SqlBuilder.SqlParameterKeyWord + SqlBuilder.GetNoTranslationColumnName(v.Key)) == it.ParameterName)); } } private string GetDbColumnName(string entityName) @@ -251,6 +266,9 @@ namespace SqlSugar } private List GetPrimaryKeys() { + if (this.WhereColumnList.IsValuable()) { + return this.WhereColumnList; + } if (this.Context.IsSystemTablesConfig) { return this.Context.DbMaintenance.GetPrimaries(this.Context.EntityProvider.GetTableName(this.EntityInfo.EntityName)); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs index a193309a0..26ef0bab5 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs @@ -188,7 +188,8 @@ namespace SqlSugar { value = value.Replace(":{}", ":null"); } - return JsonConvert.DeserializeObject(value); + var jSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }; + return JsonConvert.DeserializeObject(value,jSetting); } #endregion diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/ExpressionResult.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/ExpressionResult.cs index 9e8e2c3ae..5d24e5f54 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/ExpressionResult.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/ExpressionResult.cs @@ -8,6 +8,7 @@ namespace SqlSugar public class ExpressionResult { public bool IsLockCurrentParameter { get; set; } + public bool IsUpper { get; set; } private ExpressionParameter _CurrentParameter; public ExpressionParameter CurrentParameter { @@ -55,22 +56,32 @@ namespace SqlSugar public string GetString() { if (_Result == null) return null; - return _Result.ToString().TrimEnd(','); + if (IsUpper) + return _Result.ToString().ToUpper().TrimEnd(','); + else + return _Result.ToString().TrimEnd(','); } #region functions public string[] GetResultArray() { if (this._Result == null) return null; - return this.Result.ToString().TrimEnd(',').Split(','); + if (IsUpper) + return this.Result.ToString().ToUpper().TrimEnd(',').Split(','); + else + return this.Result.ToString().TrimEnd(',').Split(','); } public string GetResultString() { if (this._Result == null) return null; - if (this._ResolveExpressType.IsIn(ResolveExpressType.SelectMultiple, ResolveExpressType.SelectSingle)) { + if (this._ResolveExpressType.IsIn(ResolveExpressType.SelectMultiple, ResolveExpressType.SelectSingle)) + { return this.Result.ToString().TrimEnd(','); } - return this.Result.ToString(); + if (IsUpper) + return this.Result.ToString().ToUpper(); + else + return this.Result.ToString(); } public void TrimEnd() diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/SugarParameter.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/SugarParameter.cs index 6f8f632e7..4c2407b99 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/SugarParameter.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Common/SugarParameter.cs @@ -154,6 +154,15 @@ namespace SqlSugar get; set; } + ///// + ///// 如果类库是.NET 4.5请删除该属性 + ///// If the SqlSugar library is.NET 4.5, delete the property + ///// + //public override DataRowVersion SourceVersion + //{ + // get; set; + //} + public override void ResetDbType() { this.DbType = System.Data.DbType.String; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs index c765c70f0..2fdf4786e 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs @@ -67,7 +67,14 @@ namespace SqlSugar { foreach (var item in inValueIEnumerable) { - inValues.Add(item); + if (item != null && item.GetType().IsEnum()) + { + inValues.Add(Convert.ToInt64(item)); + } + else + { + inValues.Add(item); + } } } var value = model.Args[1].MemberName; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IUpdateable.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IUpdateable.cs index 4697ece81..1304fbee5 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IUpdateable.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IUpdateable.cs @@ -14,6 +14,12 @@ namespace SqlSugar IUpdateable With(string lockString); IUpdateable Where(bool isNoUpdateNull,bool IsOffIdentity = false); IUpdateable Where(Expression> expression); + /// + /// Non primary key entity update function + /// + /// + /// + IUpdateable WhereColumns(Expression> columns); IUpdateable UpdateColumns(Expression> columns); IUpdateable UpdateColumns(Func updateColumMethod); IUpdateable UpdateColumns(Expression> columns); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/Insertable.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/Insertable.cs index 21307429d..277a8d3ec 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/Insertable.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/Insertable.cs @@ -10,7 +10,8 @@ namespace SqlSugar public interface IInsertable { int ExecuteCommand(); - int ExecuteReutrnIdentity(); + int ExecuteReturnIdentity(); + T ExecuteReturnEntity(); IInsertable AS(string tableName); IInsertable With(string lockString); IInsertable InsertColumns(Expression> columns); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SimpleClient.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SimpleClient.cs index 9288e979f..ba4499a5a 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SimpleClient.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SimpleClient.cs @@ -38,7 +38,7 @@ namespace SqlSugar } public int InsertReturnIdentity(T insertObj) where T : class, new() { - return this.Context.Insertable(insertObj).ExecuteReutrnIdentity(); + return this.Context.Insertable(insertObj).ExecuteReturnIdentity(); } public bool InsertRange(T[] insertObjs) where T : class, new() { diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index 093bb311c..7b8feefb7 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 4.2.2.4 + 4.2.3.1 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html