fix: pgx closed batch return pointer if need sqlc-dev#1959

flymedllva · Feb 22, 2023 · a8b5574 · a8b5574
1 parent c8d493b
commit a8b5574
Show file tree

Hide file tree

Showing 13 changed files with 226 additions and 1 deletion.
diff --git a/internal/codegen/golang/templates/pgx/batchCode.tmpl b/internal/codegen/golang/templates/pgx/batchCode.tmpl
@@ -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
      }

diff --git a/...esult_and_params_struct_pointers/go/db.go → ...and_params_struct_pointers/mysql/go/db.go b/...esult_and_params_struct_pointers/go/db.go → ...and_params_struct_pointers/mysql/go/db.go
diff --git a/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/models.go b/internal/endtoend/testdata/emit_result_and_params_struct_pointers/mysql/go/models.go
diff --git a/..._and_params_struct_pointers/go/querier.go → ...arams_struct_pointers/mysql/go/querier.go b/..._and_params_struct_pointers/go/querier.go → ...arams_struct_pointers/mysql/go/querier.go
diff --git a/...nd_params_struct_pointers/go/query.sql.go → ...ams_struct_pointers/mysql/go/query.sql.go b/...nd_params_struct_pointers/go/query.sql.go → ...ams_struct_pointers/mysql/go/query.sql.go
diff --git a/...sult_and_params_struct_pointers/query.sql → ...nd_params_struct_pointers/mysql/query.sql b/...sult_and_params_struct_pointers/query.sql → ...nd_params_struct_pointers/mysql/query.sql
diff --git a/...sult_and_params_struct_pointers/sqlc.json → ...nd_params_struct_pointers/mysql/sqlc.json b/...sult_and_params_struct_pointers/sqlc.json → ...nd_params_struct_pointers/mysql/sqlc.json
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/internal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/db.go b/internal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/db.go
diff --git a/...t_and_params_struct_pointers/go/models.go → ...t_pointers/postgresql/pgx/v4/go/models.go b/...t_and_params_struct_pointers/go/models.go → ...t_pointers/postgresql/pgx/v4/go/models.go
diff --git a/...ndtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/query.sql.go b/...ndtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/go/query.sql.go
diff --git a/...rnal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/query.sql b/...rnal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/query.sql
@@ -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 = ?;
diff --git a/...rnal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/sqlc.json b/...rnal/endtoend/testdata/emit_result_and_params_struct_pointers/postgresql/pgx/v4/sqlc.json
@@ -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
+        }
+      }
+    }
+  ]
+}