#2133

2881099 · 2881099 · commit cf7d8f7740de · 2025-10-31T08:51:07.000+08:00
diff --git a/Providers/FreeSql.Provider.Custom/PostgreSQL/Curd/CustomPostgreSQLInsertOrUpdate.cs b/Providers/FreeSql.Provider.Custom/PostgreSQL/Curd/CustomPostgreSQLInsertOrUpdate.cs
@@ -56,7 +56,7 @@ string getInsertSql(List<T1> data, bool flagInsert, bool noneParameter)
                 if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
                 else
                 {
-                    var ocdu = new CustomPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());
+                    var ocdu = new CustomPostgreSQLOnConflictDoUpdate<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);
diff --git a/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESInsertOrUpdate.cs b/Providers/FreeSql.Provider.KingbaseES/Curd/KingbaseESInsertOrUpdate.cs
@@ -56,7 +56,7 @@ string getInsertSql(List<T1> data, bool flagInsert, bool noneParameter)
                 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);
diff --git a/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLInsertOrUpdate.cs b/Providers/FreeSql.Provider.Odbc/PostgreSQL/Curd/OdbcPostgreSQLInsertOrUpdate.cs
@@ -56,7 +56,7 @@ string getInsertSql(List<T1> data, bool flagInsert, bool noneParameter)
                 if (IdentityColumn != null && flagInsert) sql = insert.ToSql();
                 else
                 {
-                    var ocdu = new OdbcPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());
+                    var ocdu = new OdbcPostgreSQLOnConflictDoUpdate<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);

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ string getInsertSql(List<T1> data, bool flagInsert, bool noneParameter)`
`56`	`56`	`if (IdentityColumn != null && flagInsert) sql = insert.ToSql();`
`57`	`57`	`else`
`58`	`58`	`{`
`59`		`- var ocdu = new CustomPostgreSQLOnConflictDoUpdate<T1>(insert.InsertIdentity());`
	`59`	`+ var ocdu = new CustomPostgreSQLOnConflictDoUpdate<T1>(_tempPrimarys?.Length > 0 ? insert : insert.InsertIdentity());`
`60`	`60`	`ocdu._tempPrimarys = _tempPrimarys;`
`61`	`61`	`var cols = _table.Columns.Values.Where(a => _updateSetDict.ContainsKey(a.Attribute.Name) \|\|`
`62`	`62`	`_tempPrimarys.Contains(a) == false && a.Attribute.CanUpdate == true && a.Attribute.IsIdentity == false && _updateIgnore.ContainsKey(a.Attribute.Name) == false);`