Skip to content

Commit 74e63c2

Browse files
authored
fix(pgx): Do not wrap nil error (#3913)
1 parent 2f9e9d4 commit 74e63c2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

internal/codegen/golang/templates/pgx/queryCode.tmpl

+8-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,14 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) e
8989
func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) error {
9090
_, err := q.db.Exec(ctx, {{.ConstantName}}, {{.Arg.Params}})
9191
{{- end}}
92-
return {{if $.WrapErrors}}fmt.Errorf("query {{.MethodName}}: %w", err){{else}}err{{end}}
92+
{{- if $.WrapErrors }}
93+
if err != nil {
94+
return fmt.Errorf("query {{.MethodName}}: %w", err)
95+
}
96+
return nil
97+
{{- else }}
98+
return err
99+
{{- end }}
93100
}
94101
{{end}}
95102

internal/endtoend/testdata/wrap_errors/postgresql/pgx/db/query.sql.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)