Skip to content

Commit e505aec

Browse files
AisoipheoMikhail
and
Mikhail
authored
define base error in batch and fix related tests (#2147)
Co-authored-by: Mikhail <a@b.c>
1 parent 04e2695 commit e505aec

File tree

8 files changed

+55
-22
lines changed

8 files changed

+55
-22
lines changed

examples/batch/postgresql/batch.go

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

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
{{define "batchCodePgx"}}
2+
3+
var (
4+
ErrBatchAlreadyClosed = errors.New("batch already closed")
5+
)
6+
27
{{range .GoQueries}}
38
{{if eq (hasPrefix .Cmd ":batch") true }}
49
const {{.ConstantName}} = {{$.Q}}-- name: {{.MethodName}} {{.Cmd}}
@@ -51,7 +56,7 @@ func (b *{{.MethodName}}BatchResults) Exec(f func(int, error)) {
5156
for t := 0; t < b.tot; t++ {
5257
if b.closed {
5358
if f != nil {
54-
f(t, errors.New("batch already closed"))
59+
f(t, ErrBatchAlreadyClosed)
5560
}
5661
continue
5762
}
@@ -74,7 +79,7 @@ func (b *{{.MethodName}}BatchResults) Query(f func(int, []{{.Ret.DefineType}}, e
7479
{{end -}}
7580
if b.closed {
7681
if f != nil {
77-
f(t, items, errors.New("batch already closed"))
82+
f(t, items, ErrBatchAlreadyClosed)
7883
}
7984
continue
8085
}
@@ -107,7 +112,7 @@ func (b *{{.MethodName}}BatchResults) QueryRow(f func(int, {{.Ret.DefineType}},
107112
var {{.Ret.Name}} {{.Ret.Type}}
108113
if b.closed {
109114
if f != nil {
110-
f(t, {{if .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, errors.New("batch already closed"))
115+
f(t, {{if .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, ErrBatchAlreadyClosed)
111116
}
112117
continue
113118
}

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

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

internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go

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

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

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

internal/endtoend/testdata/batch_imports/postgresql/pgx/v5/go/batch.go

Lines changed: 6 additions & 2 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/batch.go

Lines changed: 5 additions & 1 deletion
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/v5/go/batch.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)