Skip to content

Bumping PGX version to 5.2 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2023
Merged

Bumping PGX version to 5.2 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/standby_cleaner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/fly-apps/postgres-flex/internal/flypg"
"github.com/fly-apps/postgres-flex/internal/flypg/admin"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"

"golang.org/x/exp/maps"
)
Expand Down
9 changes: 4 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/consul/api v1.18.0
github.com/jackc/pgconn v1.10.0
github.com/jackc/pgx/v4 v4.13.0
github.com/jackc/pgx/v5 v5.2.0
github.com/pkg/errors v0.9.1
github.com/pkg/term v1.1.0
github.com/superfly/fly-checks v0.0.0-20221220181621-bcbf6f4dc6d7
golang.org/x/exp v0.0.0-20230105202349-8879d0199aa3
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7
)

require (
Expand All @@ -30,13 +30,12 @@ require (
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.1.1 // indirect
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
github.com/jackc/pgtype v1.8.1 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/stretchr/testify v1.8.1 // indirect
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/text v0.3.8 // indirect
)
52 changes: 8 additions & 44 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/api/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/fly-apps/postgres-flex/internal/flycheck"
"github.com/fly-apps/postgres-flex/internal/flypg"
"github.com/go-chi/chi/v5"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

const Port = 5500
Expand Down
2 changes: 1 addition & 1 deletion internal/api/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"

"github.com/jackc/pgconn"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

func renderJSON(w http.ResponseWriter, data interface{}, status int) {
Expand Down
2 changes: 1 addition & 1 deletion internal/flycheck/pg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

"github.com/fly-apps/postgres-flex/internal/flypg"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
"github.com/pkg/errors"
"github.com/superfly/fly-checks/check"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/flypg/admin/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

func GrantAccess(ctx context.Context, pg *pgx.Conn, username string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/flypg/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/fly-apps/postgres-flex/internal/flypg/state"
"github.com/fly-apps/postgres-flex/internal/privnet"
"github.com/fly-apps/postgres-flex/internal/utils"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

type Credentials struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/flypg/pg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/fly-apps/postgres-flex/internal/flypg/admin"
"github.com/fly-apps/postgres-flex/internal/utils"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/flypg/pgbouncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/fly-apps/postgres-flex/internal/utils"

"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

type PGBouncer struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/flypg/repmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/fly-apps/postgres-flex/internal/utils"

"github.com/fly-apps/postgres-flex/internal/flypg/admin"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
)

const (
Expand Down