weiai/FreeSql
1
0
Fork 0
mirror of https://github.com/dotnetcore/FreeSql.git synced 2026-02-19 14:50:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dotnetcore:master' into master

Browse Source
This commit is contained in:
hnlyf888
2025-10-31 08:58:48 +08:00
committed by GitHub
parent a4a6a18973 cf7d8f7740
commit 67b9c9cc49
5 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESInsertOrUpdate.cs
View File

@@ -56,7 +56,7 @@ namespace FreeSql.KingbaseES
if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
else
{
var ocdu = new KingbaseESOnConflictDoUpdate<T1>(insert.InsertIdentity());
var ocdu = new KingbaseESOnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());
ocdu._tempPrimarys = _tempPrimarys;
var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) ||
_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);