From 15026d362157a5d38e5bc557b6b6f25d4f02f8cb Mon Sep 17 00:00:00 2001 From: Jille Timmermans Date: Thu, 22 Jun 2023 17:54:36 +0200 Subject: [PATCH 1/2] Small whitespace change in golang codegen template --- internal/codegen/golang/templates/pgx/batchCode.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/codegen/golang/templates/pgx/batchCode.tmpl b/internal/codegen/golang/templates/pgx/batchCode.tmpl index 72ac9148b4..6015e783a5 100644 --- a/internal/codegen/golang/templates/pgx/batchCode.tmpl +++ b/internal/codegen/golang/templates/pgx/batchCode.tmpl @@ -84,7 +84,7 @@ func (b *{{.MethodName}}BatchResults) Query(f func(int, []{{.Ret.DefineType}}, e continue } err := func() error { - rows, err := b.br.Query() + rows, err := b.br.Query() defer rows.Close() if err != nil { return err From 79c0f298b6cbd6a00dafab13a11cae72c86050b9 Mon Sep 17 00:00:00 2001 From: Jille Timmermans Date: Thu, 22 Jun 2023 17:57:03 +0200 Subject: [PATCH 2/2] Don't defer rows.Close() if pgx.BatchResults.Query() failed To appease staticcheck --- examples/batch/postgresql/batch.go | 2 +- internal/codegen/golang/templates/pgx/batchCode.tmpl | 2 +- internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go | 2 +- internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go | 2 +- .../testdata/batch_imports/postgresql/pgx/v4/go/batch.go | 2 +- .../testdata/batch_imports/postgresql/pgx/v5/go/batch.go | 2 +- .../endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go | 2 +- .../endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/batch/postgresql/batch.go b/examples/batch/postgresql/batch.go index bb2a6713d0..7d9352337d 100644 --- a/examples/batch/postgresql/batch.go +++ b/examples/batch/postgresql/batch.go @@ -53,10 +53,10 @@ func (b *BooksByYearBatchResults) Query(f func(int, []Book, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var i Book if err := rows.Scan( diff --git a/internal/codegen/golang/templates/pgx/batchCode.tmpl b/internal/codegen/golang/templates/pgx/batchCode.tmpl index 6015e783a5..93cdad48a3 100644 --- a/internal/codegen/golang/templates/pgx/batchCode.tmpl +++ b/internal/codegen/golang/templates/pgx/batchCode.tmpl @@ -85,10 +85,10 @@ func (b *{{.MethodName}}BatchResults) Query(f func(int, []{{.Ret.DefineType}}, e } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var {{.Ret.Name}} {{.Ret.Type}} if err := rows.Scan({{.Ret.Scan}}); err != nil { diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go b/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go index 2e3855d6ec..ec847eda6f 100644 --- a/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go +++ b/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go @@ -53,10 +53,10 @@ func (b *GetValuesBatchResults) Query(f func(int, []MyschemaFoo, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var i MyschemaFoo if err := rows.Scan(&i.A, &i.B); err != nil { diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go b/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go index 7fe2205b76..a448b60c9c 100644 --- a/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go +++ b/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go @@ -53,10 +53,10 @@ func (b *GetValuesBatchResults) Query(f func(int, []MyschemaFoo, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var i MyschemaFoo if err := rows.Scan(&i.A, &i.B); err != nil { diff --git a/internal/endtoend/testdata/batch_imports/postgresql/pgx/v4/go/batch.go b/internal/endtoend/testdata/batch_imports/postgresql/pgx/v4/go/batch.go index 92f9f01cc5..a6896789e7 100644 --- a/internal/endtoend/testdata/batch_imports/postgresql/pgx/v4/go/batch.go +++ b/internal/endtoend/testdata/batch_imports/postgresql/pgx/v4/go/batch.go @@ -53,10 +53,10 @@ func (b *GetValuesBatchResults) Query(f func(int, []MyschemaFoo, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var i MyschemaFoo if err := rows.Scan(&i.A, &i.B); err != nil { diff --git a/internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go b/internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go index b0d8f46774..868de59a23 100644 --- a/internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go +++ b/internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go @@ -53,10 +53,10 @@ func (b *GetValuesBatchResults) Query(f func(int, []MyschemaFoo, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var i MyschemaFoo if err := rows.Scan(&i.A, &i.B); err != nil { diff --git a/internal/endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go b/internal/endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go index 74bea4bc4d..27354bf286 100644 --- a/internal/endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go +++ b/internal/endtoend/testdata/output_file_names/pgx/v4/go/batch_gen.go @@ -51,10 +51,10 @@ func (b *UsersBBatchResults) Query(f func(int, []int64, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var id int64 if err := rows.Scan(&id); err != nil { diff --git a/internal/endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go b/internal/endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go index 42b3c00292..12b32818ce 100644 --- a/internal/endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go +++ b/internal/endtoend/testdata/output_file_names/pgx/v5/go/batch_gen.go @@ -51,10 +51,10 @@ func (b *UsersBBatchResults) Query(f func(int, []int64, error)) { } err := func() error { rows, err := b.br.Query() - defer rows.Close() if err != nil { return err } + defer rows.Close() for rows.Next() { var id int64 if err := rows.Scan(&id); err != nil {