From 2c20e4bbf1620bad5601fe435d31068b2f11779b Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 4 Oct 2023 19:37:50 +0800 Subject: [PATCH] Update Check --- .../SqlSugar/Abstract/FastestProvider/FastestProvider.cs | 3 +-- .../Realization/Oracle/SqlBuilder/OracleFastBuilder.cs | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/FastestProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/FastestProvider.cs index b64bbc875..d91d8f69f 100644 --- a/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/FastestProvider.cs +++ b/Src/Asp.NetCore2/SqlSugar/Abstract/FastestProvider/FastestProvider.cs @@ -208,8 +208,7 @@ namespace SqlSugar } private async Task _BulkMerge(List datas, string[] updateColumns, string[] whereColumns) - { - Check.Exception(this.entityInfo.Columns.Any(it => it.IsIdentity || it.OracleSequenceName.HasValue()), "The BulkMerge method cannot be used for increment or sequence", "BulkMerge方法不能用于自增或者序列"); + { Check.Exception(whereColumns == null || whereColumns.Count() == 0, "where columns count=0 or need primary key"); Check.Exception(whereColumns == null || whereColumns.Count() == 0, "where columns count=0 or need primary key"); var isAuto = this.context.CurrentConnectionConfig.IsAutoCloseConnection; diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleFastBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleFastBuilder.cs index 674af0950..19e9110b6 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleFastBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleFastBuilder.cs @@ -68,6 +68,7 @@ namespace SqlSugar public override Task Merge(DataTable dt, EntityInfo entityInfo, string[] whereColumns, string[] updateColumns) { + Check.Exception(this.entityInfo.Columns.Any(it => it.OracleSequenceName.HasValue()), "The BulkMerge method cannot be used for sequence", "BulkMerge方法不能用序列"); var sqlBuilder = this.Context.Queryable().SqlBuilder; var insertColumns = entityInfo.Columns .Where(it => it.IsIgnore == false)