Skip to content

Commit c1c275b

Browse files
authored
fix: pgx closed batch return pointer if need #1959 (#1960)
1 parent 37e478e commit c1c275b

19 files changed

Lines changed: 452 additions & 1 deletion

File tree

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 .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, errors.New("batch already closed"))
111111
}
112112
continue
113113
}

internal/endtoend/testdata/emit_result_and_params_struct_pointers/go/db.go renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/db.go

File renamed without changes.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/go/models.go renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/models.go

File renamed without changes.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/go/querier.go renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/querier.go

File renamed without changes.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/go/query.sql.go renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/query.sql.go

File renamed without changes.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/query.sql renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/query.sql

File renamed without changes.

internal/endtoend/testdata/emit_result_and_params_struct_pointers/sqlc.json renamed to internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/sqlc.json

File renamed without changes.

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)