From 06c80ae2dacad168a71cf60db8886fcf5e2bfcdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Senart?= Date: Sun, 13 Jan 2019 12:43:50 +0100 Subject: [PATCH] postgres: Use multierror.Error in ensureVersionTable --- database/postgres/postgres.go | 3 ++- go.mod | 1 + go.sum | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go index 3fe2f47..3703bc0 100644 --- a/database/postgres/postgres.go +++ b/database/postgres/postgres.go @@ -14,6 +14,7 @@ import ( "github.com/golang-migrate/migrate/v4" "github.com/golang-migrate/migrate/v4/database" + multierror "github.com/hashicorp/go-multierror" "github.com/lib/pq" ) @@ -341,7 +342,7 @@ func (p *Postgres) ensureVersionTable() (err error) { if e := p.Unlock(); err == nil { err = e } else if e != nil { - err = &database.Error{OrigErr: err, Err: e.Error()} + err = multierror.Append(err, e) } }() diff --git a/go.mod b/go.mod index bb6ae94..981e948 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/google/go-querystring v1.0.0 // indirect github.com/google/martian v2.1.0+incompatible // indirect github.com/gopherjs/gopherjs v0.0.0-20181004151105-1babbf986f6f // indirect + github.com/hashicorp/go-multierror v1.0.0 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect github.com/jackc/pgx v3.2.0+incompatible // indirect github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect diff --git a/go.sum b/go.sum index 3acac6a..536508a 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,10 @@ github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= github.com/jackc/pgx v3.2.0+incompatible h1:0Vihzu20St42/UDsvZGdNE6jak7oi/UOeMzwMPHkgFY=