postgres: Preserve Unlock error when outer err isn't nil

2019-01-12 11:26:31 +01:00 · 2019-01-12 11:26:31 +01:00 · 09a1959309
parent 15713e64cb
commit 09a1959309
1 changed files with 2 additions and 0 deletions
--- a/database/postgres/postgres.go
+++ b/database/postgres/postgres.go
@ -340,6 +340,8 @@ func (p *Postgres) ensureVersionTable() (err error) {
 	defer func() {
 		if e := p.Unlock(); err == nil {
 			err = e
+		} else if e != nil {
+			err = &database.Error{OrigErr: err, Err: e.Error()}
 		}
 	}()