Skip to content

Security Migration to pgx/v5 and Go 1.26.1 #4351

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

Open
noxymon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Security Migration to pgx/v5 and Go 1.26.1 #4351

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
9 changes: 1 addition & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ require (
github.com/go-sql-driver/mysql v1.9.3
github.com/google/cel-go v0.27.0
github.com/google/go-cmp v0.7.0
github.com/jackc/pgx/v4 v4.18.3
github.com/jackc/pgx/v5 v5.8.0
github.com/jackc/pgx/v5 v5.9.0
github.com/jinzhu/inflection v1.0.0
github.com/lib/pq v1.12.0
github.com/ncruces/go-sqlite3 v0.32.0
Expand All @@ -34,13 +33,8 @@ require (
cel.dev/expr v0.25.1 // indirect
filippo.io/edwards25519 v1.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.3 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/ncruces/julianday v1.0.0 // indirect
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
Expand All @@ -53,7 +47,6 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.48.0 // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/sys v0.41.0 // indirect
Expand Down
144 changes: 2 additions & 142 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/sqltest/pgx.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/sqlc-dev/sqlc/internal/sql/sqlpath"

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

func init() {
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/sqlc-pg-gen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"strings"
"text/template"

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

// https://dba.stackexchange.com/questions/255412/how-to-select-functions-that-belong-in-a-given-extension-in-postgresql
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/sqlc-pg-gen/proc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"strings"

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

// https://stackoverflow.com/questions/25308765/postgresql-how-can-i-inspect-which-arguments-to-a-procedure-have-a-default-valu
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/sqlc-pg-gen/relation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"context"

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

// Relations are the relations available in pg_tables and pg_views
Expand Down
2 changes: 2 additions & 0 deletions protos/plugin/codegen.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ message Query {
repeated string comments = 6 [json_name = "comments"];
string filename = 7 [json_name = "filename"];
Identifier insert_into_table = 8 [json_name = "insert_into_table"];
bool is_replace = 9 [json_name = "is_replace"];
bool ignore_err = 10 [json_name = "ignore_err"];
}

message Parameter {
Expand Down
Loading