Skip to content

fix: Prevent variable redeclaration in single param conflict for pgx #2058

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
kyleconroy merged 5 commits into from
Feb 23, 2023
Merged

fix: Prevent variable redeclaration in single param conflict for pgx #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e9321e
fix: Prevent variable redeclaration in single param conflict for pgx
zaneli Feb 10, 2023
f18890a
Merge branch 'main' into fix/pr1298-for-pgx
zaneli Feb 14, 2023
1a88040
generate testdata by sqlc v1.17.0
zaneli Feb 14, 2023
678470c
Merge branch 'main' into fix/pr1298-for-pgx
zaneli Feb 23, 2023
e5c92ed
generate testdata by sqlc v1.17.2
zaneli Feb 23, 2023
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: 2 additions & 0 deletions internal/codegen/golang/templates/pgx/queryCode.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) (
func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ({{.Ret.DefineType}}, error) {
row := q.db.QueryRow(ctx, {{.ConstantName}}, {{.Arg.Params}})
{{- end}}
{{- if ne .Arg.Pair .Ret.Pair }}
var {{.Ret.Name}} {{.Ret.Type}}
{{- end}}
err := row.Scan({{.Ret.Scan}})
return {{.Ret.ReturnName}}, err
}
Expand Down
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...le_param_conflict/postgresql/go/models.go → ...m_conflict/postgresql/pgx/v4/go/models.go
View file
Open in desktop
File renamed without changes.
67 changes: 67 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/go/query.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ingle_param_conflict/postgresql/query.sql → ...aram_conflict/postgresql/pgx/v4/query.sql
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v4/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "1",
"packages": [
{
"engine": "postgresql",
"sql_package": "pgx/v4",
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/db.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/go/query.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-- Example queries for sqlc
CREATE TABLE authors (
id BIGSERIAL PRIMARY KEY,
name TEXT NOT NULL,
bio text
);

-- name: GetAuthorIDByID :one
SELECT id
FROM authors
WHERE id = $1
LIMIT 1;

-- name: GetAuthorByID :one
SELECT id, name, bio
FROM authors
WHERE id = $1
LIMIT 1;

-- https://github.com/kyleconroy/sqlc/issues/1290
CREATE TABLE users (
sub UUID PRIMARY KEY
);

-- name: GetUser :one
SELECT sub
FROM users
WHERE sub = $1
LIMIT 1;

-- https://github.com/kyleconroy/sqlc/issues/1235

-- name: SetDefaultName :one
UPDATE authors
SET name = "Default Name"
WHERE id = $1
RETURNING id;
13 changes: 13 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/pgx/v5/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "1",
"packages": [
{
"engine": "postgresql",
"sql_package": "pgx/v5",
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}
0 ...single_param_conflict/postgresql/go/db.go → ...param_conflict/postgresql/stdlib/go/db.go
View file
Open in desktop
File renamed without changes.
21 changes: 21 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/go/models.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...param_conflict/postgresql/go/query.sql.go → ...onflict/postgresql/stdlib/go/query.sql.go
View file
Open in desktop
File renamed without changes.
37 changes: 37 additions & 0 deletions internal/endtoend/testdata/single_param_conflict/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
-- Example queries for sqlc
CREATE TABLE authors (
id BIGSERIAL PRIMARY KEY,
name TEXT NOT NULL,
bio text
);

-- name: GetAuthorIDByID :one
SELECT id
FROM authors
WHERE id = $1
LIMIT 1;

-- name: GetAuthorByID :one
SELECT id, name, bio
FROM authors
WHERE id = $1
LIMIT 1;

-- https://github.com/kyleconroy/sqlc/issues/1290
CREATE TABLE users (
sub UUID PRIMARY KEY
);

-- name: GetUser :one
SELECT sub
FROM users
WHERE sub = $1
LIMIT 1;

-- https://github.com/kyleconroy/sqlc/issues/1235

-- name: SetDefaultName :one
UPDATE authors
SET name = "Default Name"
WHERE id = $1
RETURNING id;
0 ...ingle_param_conflict/postgresql/sqlc.json → ...aram_conflict/postgresql/stdlib/sqlc.json
View file
Open in desktop
File renamed without changes.