Skip to content

fix(pgx): Do not wrap nil error #3913

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 1 commit into from
Apr 1, 2025
+12 −2
Merged

fix(pgx): Do not wrap nil error #3913

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
fix(pgx): Do not wrap nil error
  • Loading branch information
@kyleconroy
kyleconroy committed Apr 1, 2025
commit 0af131e8511b67dfe2f4507fc11d1ccefe94a694
9 changes: 8 additions & 1 deletion internal/codegen/golang/templates/pgx/queryCode.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,14 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) e
func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) error {
_, err := q.db.Exec(ctx, {{.ConstantName}}, {{.Arg.Params}})
{{- end}}
return {{if $.WrapErrors}}fmt.Errorf("query {{.MethodName}}: %w", err){{else}}err{{end}}
{{- if $.WrapErrors }}
if err != nil {
return fmt.Errorf("query {{.MethodName}}: %w", err)
}
return nil
{{- else }}
return err
{{- end }}
}
{{end}}

Expand Down
5 changes: 4 additions & 1 deletion internal/endtoend/testdata/wrap_errors/postgresql/pgx/db/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.

Loading