From fafdaaccf43fee3e9b4c0bb084e99bb0a088f56f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 24 Aug 2022 00:43:45 +0800 Subject: [PATCH] Update .net core project --- .../InsertableProvider/InsertableHelper.cs | 100 ++++++++++++++++++ .../InsertableProvider/InsertableProvider.cs | 29 +++++ .../SqlBuilderProvider/InsertBuilder.cs | 4 + .../SqlSugar/Interface/Insertable.cs | 1 + .../SqlBuilder/PostgreSQLInsertBuilder.cs | 4 + .../SqlBuilder/SqlServerInsertBuilder.cs | 9 ++ 6 files changed, 147 insertions(+) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableHelper.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableHelper.cs index a22ac828f..123821dff 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableHelper.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableHelper.cs @@ -512,5 +512,105 @@ namespace SqlSugar } #endregion + + #region Insert PkList + + private List InsertPkListWithFunc(EntityColumnInfo pkInfo) + { + InsertBuilder.IsReturnPkList = true; + InsertBuilder.IsNoPage = true; + string sql = _ExecuteCommand(); + sql = this.InsertBuilder.ConvertInsertReturnIdFunc(SqlBuilder.GetTranslationColumnName(pkInfo.DbColumnName), sql); + var result = Ado.SqlQuery(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); + After(sql, null); + return result; + } + + private List InsertPkListNoFunc(EntityColumnInfo pkInfo) + { + if (this.Ado.Transaction != null) + { + return ReturnDefaultIdentity(pkInfo); + } + else + { + try + { + this.Context.Ado.BeginTran(); + var result = ReturnDefaultIdentity(pkInfo); + this.Context.Ado.CommitTran(); + return result; + } + catch (Exception ex) + { + this.Context.Ado.RollbackTran(); + throw ex; + } + } + } + + private List InsertPkListIdentityCount1(EntityColumnInfo pkInfo) + { + if (pkInfo.UnderType == UtilConstants.IntType) + { + return new List { (Type)(object)this.ExecuteReturnIdentity() }; + } + else + { + return new List { (Type)(object)this.ExecuteReturnBigIdentity() }; + } + } + + private List InsertPkListLong() + { + var list = this.ExecuteReturnSnowflakeIdList(); + try + { + return list.Cast().ToList(); + } + catch + { + Check.ExceptionEasy($"long to ExecuteReturnPkList<{typeof(Type).Name}> error ", $" long 转换成ExecuteReturnPkList<{typeof(Type).Name}>失败"); + return null; + } + } + + private List InsertPkListGuid(EntityColumnInfo pkInfo) + { + Check.ExceptionEasy(pkInfo.UnderType.Name != typeof(Type).Name, $"{pkInfo.UnderType.Name} to ExecuteReturnPkList<{typeof(Type).Name}> error ", $" {pkInfo.UnderType.Name} 转换成ExecuteReturnPkList<{typeof(Type).Name}>失败"); + this.ExecuteCommand(); + List result = new List(); + if (InsertBuilder.DbColumnInfoList.HasValue()) + { + foreach (var item in InsertBuilder.DbColumnInfoList) + { + var isPk = item.DbColumnName.EqualCase(pkInfo.DbColumnName); + if (isPk) + { + result.Add((Type)item.Value); + } + } + } + return result; + } + private List ReturnDefaultIdentity(EntityColumnInfo pkInfo) + { + List result = new List(); + foreach (var item in this.InsertObjs) + { + var insertable = this.Context.Insertable(item) + .InsertColumns(this.InsertBuilder.DbColumnInfoList.Select(it => it.DbColumnName).Distinct().ToArray()); + if (pkInfo.UnderType == UtilConstants.IntType) + { + result.Add((Type)(object)insertable.ExecuteReturnIdentity()); + } + else + { + result.Add((Type)(object)insertable.ExecuteReturnBigIdentity()); + } + } + return result; + } + #endregion } } diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index 383f84c64..9f996ac27 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -70,6 +70,35 @@ namespace SqlSugar RestoreMapping(); return new KeyValuePair>(sql, InsertBuilder.Parameters); } + + public virtual List ExecuteReturnPkList() + { + var pkInfo= this.EntityInfo.Columns.FirstOrDefault(it => it.IsPrimarykey == true); + Check.ExceptionEasy(pkInfo==null,"ExecuteReturnPkList need primary key", "ExecuteReturnPkList需要主键"); + Check.ExceptionEasy(this.EntityInfo.Columns.Count(it => it.IsPrimarykey == true)>1, "ExecuteReturnPkList ，Only support technology single primary key", "ExecuteReturnPkList只支技单主键"); + var isIdEntity = pkInfo.IsIdentity|| (pkInfo.OracleSequenceName.HasValue()&&this.Context.CurrentConnectionConfig.DbType==DbType.Oracle); + if (pkInfo.UnderType == UtilConstants.LongType) + { + return InsertPkListLong(); + } + else if (isIdEntity&&this.InsertObjs.Length==1) + { + return InsertPkListIdentityCount1(pkInfo); + } + else if (isIdEntity && this.InsertBuilder.ConvertInsertReturnIdFunc == null) + { + return InsertPkListNoFunc(pkInfo); + } + else if (isIdEntity && this.InsertBuilder.ConvertInsertReturnIdFunc != null) + { + return InsertPkListWithFunc(pkInfo); + } + else + { + return InsertPkListGuid(pkInfo); + } + } + public virtual int ExecuteReturnIdentity() { if (this.InsertObjs.Count() == 1 && this.InsertObjs.First() == null) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs index 524ca94da..a48cd08c7 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs @@ -31,6 +31,10 @@ namespace SqlSugar public Dictionary OracleSeqInfoList { get; set; } public bool IsBlukCopy { get; set; } public virtual bool IsOleDb { get; set; } + public virtual Func ConvertInsertReturnIdFunc { get; set; } + public virtual bool IsNoPage { get; set; } + + public virtual bool IsReturnPkList { get; set; } #endregion #region SqlTemplate diff --git a/Src/Asp.NetCore2/SqlSugar/Interface/Insertable.cs b/Src/Asp.NetCore2/SqlSugar/Interface/Insertable.cs index f45a62b57..118a93a06 100644 --- a/Src/Asp.NetCore2/SqlSugar/Interface/Insertable.cs +++ b/Src/Asp.NetCore2/SqlSugar/Interface/Insertable.cs @@ -12,6 +12,7 @@ namespace SqlSugar InsertBuilder InsertBuilder { get; set; } int ExecuteCommand(); Task ExecuteCommandAsync(); + List ExecuteReturnPkList(); long ExecuteReturnSnowflakeId(); List ExecuteReturnSnowflakeIdList(); Task ExecuteReturnSnowflakeIdAsync(); diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs index 5610b99cb..bdd43340d 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs @@ -32,6 +32,10 @@ namespace SqlSugar public override string SqlTemplateBatchSelect => " {0} "; + public override Func ConvertInsertReturnIdFunc { get; set; } = (name, sql) => + { + return sql.Trim().TrimEnd(';')+ $"returning {name} "; + }; public override string ToSqlString() { if (IsNoInsertNull) diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerInsertBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerInsertBuilder.cs index 2a46ce0d3..0c65fb23a 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerInsertBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerInsertBuilder.cs @@ -8,6 +8,11 @@ namespace SqlSugar { public class SqlServerInsertBuilder:InsertBuilder { + public override Func ConvertInsertReturnIdFunc { get; set; } = (name, sql) => + { + return sql.Replace("select SCOPE_IDENTITY();", "").Replace(")\r\n SELECT", $")\r\n OUTPUT INSERTED.{name} as {name} \r\nSELECT"); + }; + public override bool IsNoPage { get; set; } = true; public override string ToSqlString() { if (IsNoInsertNull) @@ -34,6 +39,10 @@ namespace SqlSugar { pageSize = 100; } + if (IsNoPage && IsReturnPkList) + { + pageSize = groupList.Count; + } int pageIndex = 1; int totalRecord = groupList.Count; int pageCount = (totalRecord + pageSize - 1) / pageSize;