fix: use single on conflict clause

flanksource · Sep 12, 2024 · 6a9f430 · 6a9f430
1 parent 550eb22
commit 6a9f430
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/models/components.go b/models/components.go
@@ -337,10 +337,6 @@ func (c *Component) Save(db *gorm.DB) error {
 			Columns:   []clause.Column{{Name: "topology_id"}, {Name: "type"}, {Name: "name"}, {Name: "parent_id"}},
 			UpdateAll: true,
 		},
-		clause.OnConflict{
-			Columns:   []clause.Column{{Name: "id"}},
-			UpdateAll: true,
-		},
 	).Create(c).Error
 
 	if err != nil {

diff --git a/models/topology.go b/models/topology.go
@@ -60,11 +60,6 @@ func (t *Topology) AsMap(removeFields ...string) map[string]any {
 }
 
 func (t *Topology) Save(db *gorm.DB) error {
-	err := db.Clauses(Topology{}.OnConflictClause(),
-		clause.OnConflict{
-			Columns:   []clause.Column{{Name: "id"}},
-			DoUpdates: clause.AssignmentColumns([]string{"labels", "spec"}),
-		},
-	).Create(t).Error
+	err := db.Clauses(Topology{}.OnConflictClause()).Create(t).Error
 	return err
 }