From 1ec0ba0a93fa4304db2d366d95e35e3272491dad Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 10 May 2021 15:58:09 -0500 Subject: [PATCH] Migrate the server upsert query to use database time (#1214) * Migrate the server upsert query to use database time This ensures that we are using consistent ideas of time regardless of the local time on each worker (for this query). * Fix insert part of the upsert query --- internal/servers/query.go | 4 ++-- internal/servers/repository.go | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/servers/query.go b/internal/servers/query.go index 6f6268e747..afc44040f7 100644 --- a/internal/servers/query.go +++ b/internal/servers/query.go @@ -5,13 +5,13 @@ const ( insert into server (private_id, type, description, address, update_time) values - ($1, $2, $3, $4, $5) + ($1, $2, $3, $4, now()) on conflict on constraint server_pkey do update set type = $2, description = $3, address = $4, - update_time = $5; + update_time = now(); ` deleteWhereCreateTimeSql = `create_time < $1` deleteTagsSql = `server_id = $1` diff --git a/internal/servers/repository.go b/internal/servers/repository.go index d59a0776f7..e0d25f65ea 100644 --- a/internal/servers/repository.go +++ b/internal/servers/repository.go @@ -136,7 +136,6 @@ func (r *Repository) UpsertServer(ctx context.Context, server *Server, opt ...Op server.Type, server.Description, server.Address, - time.Now().Format(time.RFC3339), }) if err != nil { return errors.Wrap(err, op+":Upsert")