Skip to content

Commit bcd037a

Browse files
committed
fix: pgx closed batch return pointer if need #1959
1 parent 3623ec8 commit bcd037a

File tree

15 files changed

+227
-4
lines changed

15 files changed

+227
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (b *{{.MethodName}}BatchResults) QueryRow(f func(int, {{.Ret.DefineType}},
107107
var {{.Ret.Name}} {{.Ret.Type}}
108108
if b.closed {
109109
if f != nil {
110-
f(t, {{.Ret.Name}}, errors.New("batch already closed"))
110+
f(t, {{if hasPrefix .Ret.DefineType "*"}}nil{{else}}{{.Ret.Name}}{{end}}, errors.New("batch already closed"))
111111
}
112112
continue
113113
}

internal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/batch.go

Lines changed: 68 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/db.go

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/models.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)