define base error in batch and fix related tests (#2147)

Co-authored-by: Mikhail <a@b.c>
sqlc-dev · Apr 7, 2023 · e505aec · e505aec
1 parent 04e2695
commit e505aec
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 22 deletions.
diff --git a/examples/batch/postgresql/batch.go b/examples/batch/postgresql/batch.go
diff --git a/internal/codegen/golang/templates/pgx/batchCode.tmpl b/internal/codegen/golang/templates/pgx/batchCode.tmpl
@@ -1,4 +1,9 @@
 {{define "batchCodePgx"}}
+
+var (
+	ErrBatchAlreadyClosed = errors.New("batch already closed")
+)
+
 {{range .GoQueries}}
 {{if eq (hasPrefix .Cmd ":batch") true }}
 const {{.ConstantName}} = {{$.Q}}-- name: {{.MethodName}} {{.Cmd}}
@@ -51,7 +56,7 @@ func (b *{{.MethodName}}BatchResults) Exec(f func(int, error)) {
    for t := 0; t < b.tot; t++ {
      if b.closed {
        if f != nil {
-         f(t, errors.New("batch already closed"))
+         f(t, ErrBatchAlreadyClosed)
        }
        continue
      }
@@ -74,7 +79,7 @@ func (b *{{.MethodName}}BatchResults) Query(f func(int, []{{.Ret.DefineType}}, e
      {{end -}}
      if b.closed {
         if f != nil {
-          f(t, items, errors.New("batch already closed"))
+          f(t, items, ErrBatchAlreadyClosed)
         }
         continue
      }
@@ -107,7 +112,7 @@ func (b *{{.MethodName}}BatchResults) QueryRow(f func(int, {{.Ret.DefineType}},
      var {{.Ret.Name}} {{.Ret.Type}}
      if b.closed {
         if f != nil {
-          f(t, {{if .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, errors.New("batch already closed"))
+          f(t, {{if .Ret.IsPointer}}nil{{else}}{{.Ret.Name}}{{end}}, ErrBatchAlreadyClosed)
         }
         continue
      }

diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go b/internal/endtoend/testdata/batch/postgresql/pgx/v4/go/batch.go
diff --git a/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go b/internal/endtoend/testdata/batch/postgresql/pgx/v5/go/batch.go
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
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
diff --git a/...al/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/batch.go b/...al/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/batch.go
diff --git a/...al/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v5/go/batch.go b/...al/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v5/go/batch.go