diff --git a/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index 383f84c64..60cc0a554 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -70,6 +70,68 @@ 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需要主键"); + var isIdEntity = pkInfo.IsIdentity|| (pkInfo.OracleSequenceName.HasValue()&&this.Context.CurrentConnectionConfig.DbType==DbType.Oracle); + if (pkInfo.UnderType == UtilConstants.LongType) + { + 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; + } + } + else if (isIdEntity&&this.InsertObjs.Length==1) + { + if (pkInfo.UnderType == UtilConstants.IntType) + { + return new List { (Type)(object)this.ExecuteReturnIdentity() }; + } + else + { + return new List { (Type)(object)this.ExecuteReturnBigIdentity() }; + } + } + else if (isIdEntity && this.InsertBuilder.ConvertInsertReturnIdFunc == null) + { + Check.ExceptionEasy("The current database does not support batch auto increment", "当前数据库不支持批量返回自增"); + return null; + } + else if (isIdEntity && this.InsertBuilder.ConvertInsertReturnIdFunc != null) + { + string sql = _ExecuteCommand(); + sql= this.InsertBuilder.ConvertInsertReturnIdFunc(pkInfo.DbColumnName,sql); + var result = Ado.SqlQuery(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray()); + After(sql, null); + return result; + } + else + { + 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; + } + } public virtual int ExecuteReturnIdentity() { if (this.InsertObjs.Count() == 1 && this.InsertObjs.First() == null) diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs index 524ca94da..27e7f0368 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/InsertBuilder.cs @@ -120,6 +120,9 @@ namespace SqlSugar return result; } } + + public virtual Func ConvertInsertReturnIdFunc { get; set; } + public virtual ExpressionResult GetExpressionValue(Expression expression, ResolveExpressType resolveType) { ILambdaExpressions resolveExpress = this.LambdaExpressions; diff --git a/Src/Asp.Net/SqlSugar/Interface/Insertable.cs b/Src/Asp.Net/SqlSugar/Interface/Insertable.cs index f45a62b57..118a93a06 100644 --- a/Src/Asp.Net/SqlSugar/Interface/Insertable.cs +++ b/Src/Asp.Net/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.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs b/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs index 5610b99cb..bdd43340d 100644 --- a/Src/Asp.Net/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLInsertBuilder.cs +++ b/Src/Asp.Net/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)