From c914040b7d8b6139d48604bdcab4fdc9838f03ef Mon Sep 17 00:00:00 2001 From: sagitchu Date: Sat, 21 Mar 2026 19:40:16 +0800 Subject: [PATCH] fix(repo): qualify tunnel_metric columns to avoid ambiguity in ON CONFLICT --- go-backend/internal/store/repo/repository.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/go-backend/internal/store/repo/repository.go b/go-backend/internal/store/repo/repository.go index 3171d64..a6f7848 100644 --- a/go-backend/internal/store/repo/repository.go +++ b/go-backend/internal/store/repo/repository.go @@ -3422,10 +3422,10 @@ func (r *Repository) UpsertTunnelMetricBuckets(metrics []*model.TunnelMetric) er return r.db.Clauses(clause.OnConflict{ Columns: []clause.Column{{Name: "tunnel_id"}, {Name: "node_id"}, {Name: "timestamp"}}, DoUpdates: clause.Assignments(map[string]interface{}{ - "bytes_in": gorm.Expr("bytes_in + excluded.bytes_in"), - "bytes_out": gorm.Expr("bytes_out + excluded.bytes_out"), - "connections": gorm.Expr("connections + excluded.connections"), - "errors": gorm.Expr("errors + excluded.errors"), + "bytes_in": gorm.Expr("tunnel_metric.bytes_in + excluded.bytes_in"), + "bytes_out": gorm.Expr("tunnel_metric.bytes_out + excluded.bytes_out"), + "connections": gorm.Expr("tunnel_metric.connections + excluded.connections"), + "errors": gorm.Expr("tunnel_metric.errors + excluded.errors"), // avg_latency_ms is not additive; keep the existing bucket value. }), }).CreateInBatches(rows, 100).Error