Skip to content

Commit 8d616db

Browse files
Jilleandrewmbenton
authored andcommitted
fix: Don't defer rows.Close() if pgx.BatchResults.Query() failed (#2362)
* Small whitespace change in golang codegen template * Don't defer rows.Close() if pgx.BatchResults.Query() failed To appease staticcheck
1 parent d228c7b commit 8d616db

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

Diff for: examples/batch/postgresql/batch.go

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

Diff for: internal/codegen/golang/templates/pgx/batchCode.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ func (b *{{.MethodName}}BatchResults) Query(f func(int, []{{.Ret.DefineType}}, e
8484
continue
8585
}
8686
err := func() error {
87-
rows, err := b.br.Query()
88-
defer rows.Close()
87+
rows, err := b.br.Query()
8988
if err != nil {
9089
return err
9190
}
91+
defer rows.Close()
9292
for rows.Next() {
9393
var {{.Ret.Name}} {{.Ret.Type}}
9494
if err := rows.Scan({{.Ret.Scan}}); err != nil {

Diff for: internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go

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

Diff for: internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go

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

Diff for: internal/endtoend/testdata/batch_imports/postgresql/pgx/v4/go/batch.go

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

Diff for: internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go

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

Diff for: internal/endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go

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

Diff for: internal/endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go

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

0 commit comments

Comments
 (0)