3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-05 02:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

postgres: upgrade to pgx v5 (#3826)

Browse source
This commit is contained in:
Caleb Doxsey 2022-12-19 12:47:35 -07:00 • committed by GitHub
parent f99ea7c8ad
commit c048af7523
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 47 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

23
pkg/storage/postgres/backend.go
View file

@ -9,8 +9,7 @@ import (
"time"
"github.com/cenkalti/backoff/v4"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgxpool"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/pomerium/pomerium/internal/log"
@ -326,20 +325,28 @@ func (backend *Backend) init(ctx context.Context) (serverVersion uint64, pool *p
return serverVersion, nil, err
}
pool, err = pgxpool.ConnectConfig(context.Background(), config)
pool, err = pgxpool.NewWithConfig(context.Background(), config)
if err != nil {
return serverVersion, nil, err
}
err = pool.BeginFunc(ctx, func(tx pgx.Tx) error {
var err error
serverVersion, err = migrate(ctx, tx)
return err
})
tx, err := pool.Begin(ctx)
if err != nil {
return serverVersion, nil, err
}
serverVersion, err = migrate(ctx, tx)
if err != nil {
_ = tx.Rollback(ctx)
return serverVersion, nil, err
}
err = tx.Commit(ctx)
if err != nil {
_ = tx.Rollback(ctx)
return serverVersion, nil, err
}
backend.serverVersion = serverVersion
backend.pool = pool
return serverVersion, pool, nil