Merge pull request #57 from yrxx98/master

Upsert时columns默认参数null
This commit is contained in:
Stone 2025-01-07 14:00:34 +08:00 committed by GitHub
commit bced16fa57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions

View File

@ -810,7 +810,7 @@ public static class EntityExtension
/// 简单来说对于一行记录如果Insert 成功则返回1如果需要执行的是update 则返回2
/// Oracle返回值无论是插入还是更新返回的都始终为-1
/// </returns>
public static Int32 Upsert<T>(this IEnumerable<T> list, IDataColumn[]? columns, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null) where T : IEntity
public static Int32 Upsert<T>(this IEnumerable<T> list, IDataColumn[]? columns = null, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null) where T : IEntity
{
var option = new BatchOption(columns, updateColumns, addColumns);
return BatchUpsert(list, option, session);
@ -951,7 +951,7 @@ public static class EntityExtension
/// do update success =2次(insert 1次+update 1次)
/// 简单来说如果Insert 成功则返回1如果需要执行的是update 则返回2
/// </returns>
public static Int32 Upsert(this IEntity entity, IDataColumn[]? columns, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null)
public static Int32 Upsert(this IEntity entity, IDataColumn[]? columns = null, ICollection<String>? updateColumns = null, ICollection<String>? addColumns = null, IEntitySession? session = null)
{
var option = new BatchOption(columns, updateColumns, addColumns);
return Upsert(entity, option, session);