Skip to content
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.

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

Upgrade jackc/pgx to v5 #819

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
matrix:
go-version:
- "1.17.x"
- "1.18.x"
- "1.19.x"

services:
mysql:
Expand Down Expand Up @@ -61,8 +61,8 @@ jobs:
strategy:
matrix:
go-version:
- "1.17.x"
- "1.18.x"
- "1.19.x"

services:
postgres:
Expand Down Expand Up @@ -106,8 +106,8 @@ jobs:
strategy:
matrix:
go-version:
- "1.17.x"
- "1.18.x"
- "1.19.x"

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -151,8 +151,8 @@ jobs:
strategy:
matrix:
go-version:
- "1.17.x"
- "1.18.x"
- "1.19.x"

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -194,8 +194,8 @@ jobs:
strategy:
matrix:
go-version:
- "1.17.x"
- "1.18.x"
- "1.19.x"
os:
- "macos-latest"
- "windows-latest"
Expand Down
9 changes: 1 addition & 8 deletions SHOULDERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,9 @@ Thank you to the following **GIANTS**:
* [github.com/inconshreveable/mousetrap](https://godoc.org/github.com/inconshreveable/mousetrap)
* [github.com/jackc/chunkreader](https://godoc.org/github.com/jackc/chunkreader)
* [github.com/jackc/chunkreader/v2](https://godoc.org/github.com/jackc/chunkreader/v2)
* [github.com/jackc/pgconn](https://godoc.org/github.com/jackc/pgconn)
* [github.com/jackc/pgio](https://godoc.org/github.com/jackc/pgio)
* [github.com/jackc/pgmock](https://godoc.org/github.com/jackc/pgmock)
* [github.com/jackc/pgpassfile](https://godoc.org/github.com/jackc/pgpassfile)
* [github.com/jackc/pgproto3](https://godoc.org/github.com/jackc/pgproto3)
* [github.com/jackc/pgproto3/v2](https://godoc.org/github.com/jackc/pgproto3/v2)
* [github.com/jackc/pgservicefile](https://godoc.org/github.com/jackc/pgservicefile)
* [github.com/jackc/pgtype](https://godoc.org/github.com/jackc/pgtype)
* [github.com/jackc/pgx/v4](https://godoc.org/github.com/jackc/pgx/v4)
* [github.com/jackc/puddle](https://godoc.org/github.com/jackc/puddle)
* [github.com/jackc/pgx/v5](https://godoc.org/github.com/jackc/pgx/v5)
* [github.com/jmoiron/sqlx](https://godoc.org/github.com/jmoiron/sqlx)
* [github.com/joho/godotenv](https://godoc.org/github.com/joho/godotenv)
* [github.com/kballard/go-shellquote](https://godoc.org/github.com/kballard/go-shellquote)
Expand Down
2 changes: 1 addition & 1 deletion connection_instrumented.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

mysqld "github.com/go-sql-driver/mysql"
"github.com/gobuffalo/pop/v6/logging"
pgx "github.com/jackc/pgx/v4/stdlib"
pgx "github.com/jackc/pgx/v5/stdlib"
"github.com/jmoiron/sqlx"
"github.com/luna-duclos/instrumentedsql"
)
Expand Down
2 changes: 1 addition & 1 deletion dialect_cockroach.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/gobuffalo/pop/v6/internal/defaults"
"github.com/gobuffalo/pop/v6/logging"
"github.com/gofrs/uuid"
_ "github.com/jackc/pgx/v4/stdlib" // Import PostgreSQL driver
_ "github.com/jackc/pgx/v5/stdlib" // Import PostgreSQL driver
"github.com/jmoiron/sqlx"
)

Expand Down
4 changes: 2 additions & 2 deletions dialect_postgresql.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/gobuffalo/pop/v6/columns"
"github.com/gobuffalo/pop/v6/internal/defaults"
"github.com/gobuffalo/pop/v6/logging"
"github.com/jackc/pgconn"
_ "github.com/jackc/pgx/v4/stdlib" // Load pgx driver
"github.com/jackc/pgx/v5/pgconn"
_ "github.com/jackc/pgx/v5/stdlib" // Load pgx driver
"github.com/jmoiron/sqlx"
)

Expand Down
42 changes: 39 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/gobuffalo/pop/v6

go 1.16
go 1.18

require (
github.com/fatih/color v1.13.0
Expand All @@ -15,8 +15,7 @@ require (
github.com/gobuffalo/plush/v4 v4.1.18
github.com/gobuffalo/validate/v3 v3.3.3
github.com/gofrs/uuid v4.3.1+incompatible
github.com/jackc/pgconn v1.13.0
github.com/jackc/pgx/v4 v4.17.2
github.com/jackc/pgx/v5 v5.3.1
github.com/jmoiron/sqlx v1.3.5
github.com/lib/pq v1.10.7
github.com/luna-duclos/instrumentedsql v1.1.3
Expand All @@ -26,3 +25,40 @@ require (
golang.org/x/sync v0.1.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/gobuffalo/github_flavored_markdown v1.1.3 // indirect
github.com/gobuffalo/helpers v0.6.7 // indirect
github.com/gobuffalo/packd v1.0.2 // indirect
github.com/gobuffalo/tags/v3 v3.1.4 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/joho/godotenv v1.4.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.9 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/microcosm-cc/bluemonday v1.0.20 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.6.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/tools v0.1.12 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading