Skip to content

Commit

Permalink
fix: pgx closed batch return pointer if need #1959 (#1960)
Browse files Browse the repository at this point in the history
  • Loading branch information
flymedllva authored Feb 23, 2023
1 parent 37e478e commit c1c275b
Show file tree
Hide file tree
Showing 19 changed files with 452 additions and 1 deletion.
2 changes: 1 addition & 1 deletion internal/codegen/golang/templates/pgx/batchCode.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (b *{{.MethodName}}BatchResults) QueryRow(f func(int, {{.Ret.DefineType}},
var {{.Ret.Name}} {{.Ret.Type}}
if b.closed {
if f != nil {
f(t, {{.Ret.Name}}, errors.New("batch already closed"))
f(t, {{if .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, errors.New("batch already closed"))
}
continue
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
CREATE TABLE foo (a integer, b integer);

-- name: InsertValues :batchone
INSERT INTO foo (a, b)
VALUES ($1, $2)
ON CONFLICT DO NOTHING
RETURNING *;

-- name: GetOne :one
SELECT * FROM foo WHERE a = ? AND b = ? LIMIT 1;

-- name: GetAll :many
SELECT * FROM foo;

-- name: GetAllAByB :many
SELECT a FROM foo WHERE b = ?;
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2",
"sql": [
{
"engine": "postgresql",
"schema": "query.sql",
"queries": "query.sql",
"gen": {
"go": {
"package": "querytest",
"sql_package": "pgx/v4",
"out": "go",
"emit_result_struct_pointers": true,
"emit_params_struct_pointers": true
}
}
}
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c1c275b

Please sign in to comment.