lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-19 18:22:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update BulkMerge

Browse Source
This commit is contained in:
sunkaixuan
2023-10-04 19:49:27 +08:00
parent 2c20e4bbf1
commit 90f57098ca
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Asp.NetCore2/SqlSugar/Realization/Oracle/SqlBuilder/OracleFastBuilder.cs
View File

@@ -73,6 +73,8 @@ namespace SqlSugar
var insertColumns = entityInfo.Columns var insertColumns = entityInfo.Columns
.Where(it => it.IsIgnore == false) .Where(it => it.IsIgnore == false)
.Where(it => it.IsIdentity == false) .Where(it => it.IsIdentity == false)
.Where(it => it.InsertServerTime == false)
.Where(it => it.InsertSql == null)
.Where(it => it.OracleSequenceName == null) .Where(it => it.OracleSequenceName == null)
.Where(it => it.IsOnlyIgnoreInsert == false); .Where(it => it.IsOnlyIgnoreInsert == false);
var whereSql =string.Join(" , ",whereColumns.Select(it=> $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}")); var whereSql =string.Join(" , ",whereColumns.Select(it=> $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}"));

2
Src/Asp.NetCore2/SqlSugar/Realization/SqlServer/SqlBuilder/SqlServerFastBuilder.cs
View File

@@ -73,6 +73,8 @@ namespace SqlSugar
.Where(it => it.IsIgnore == false) .Where(it => it.IsIgnore == false)
.Where(it => it.IsIdentity == false) .Where(it => it.IsIdentity == false)
.Where(it => it.OracleSequenceName == null) .Where(it => it.OracleSequenceName == null)
.Where(it => it.InsertServerTime == false)
.Where(it => it.InsertSql == null)
.Where(it => it.IsOnlyIgnoreInsert == false); .Where(it => it.IsOnlyIgnoreInsert == false);
var whereSql = string.Join(" , ", whereColumns.Select(it => $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}")); var whereSql = string.Join(" , ", whereColumns.Select(it => $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}"));
var updateColumnsSql = string.Join(" , ", updateColumns.Select(it => $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}")); var updateColumnsSql = string.Join(" , ", updateColumns.Select(it => $"tgt.{sqlBuilder.GetTranslationColumnName(it)}=src.{sqlBuilder.GetTranslationColumnName(it)}"));