Skip to content

Commit 80f6ec3

Browse files
tychytychy
authored
fix(codegen/go): compare define type in codegen (#2263) (#2578)
1 parent e73ad79 commit 80f6ec3

File tree

5 files changed

+36
-2
lines changed

5 files changed

+36
-2
lines changed

‎internal/codegen/golang/templates/pgx/queryCode.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, db DBTX, {{.Arg.Pair}}) (
3333
func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ({{.Ret.DefineType}}, error) {
3434
row := q.db.QueryRow(ctx, {{.ConstantName}}, {{.Arg.Params}})
3535
{{- end}}
36-
{{- if ne .Arg.Pair .Ret.Pair }}
36+
{{- if or (ne .Arg.Pair .Ret.Pair) (ne .Arg.DefineType .Ret.DefineType) }}
3737
var {{.Ret.Name}} {{.Ret.Type}}
3838
{{- end}}
3939
err := row.Scan({{.Ret.Scan}})

‎internal/codegen/golang/templates/stdlib/queryCode.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type {{.Ret.Type}} struct { {{- range .Ret.Struct.Fields}}
2424
{{end -}}
2525
func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}) ({{.Ret.DefineType}}, error) {
2626
{{- template "queryCodeStdExec" . }}
27-
{{- if ne .Arg.Pair .Ret.Pair }}
27+
{{- if or (ne .Arg.Pair .Ret.Pair) (ne .Arg.DefineType .Ret.DefineType) }}
2828
var {{.Ret.Name}} {{.Ret.Type}}
2929
{{- end}}
3030
err := row.Scan({{.Ret.Scan}})

‎internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/models.go

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

‎internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/go/query.sql.go

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

‎internal/endtoend/testdata/query_parameter_limit_to_two/postgresql/query.sql

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,16 @@ WHERE id IN (sqlc.slice(ids)) AND name = $1;
3333

3434
-- name: CreateAuthorOnlyTitles :one
3535
INSERT INTO authors (name, titles) VALUES ($1, $2) RETURNING *;
36+
37+
CREATE TABLE clients (
38+
id INT PRIMARY KEY,
39+
name TEXT NOT NULL
40+
);
41+
42+
-- name: AddNewClient :one
43+
INSERT INTO clients (
44+
id, name
45+
) VALUES (
46+
$1, $2
47+
)
48+
RETURNING *;

0 commit comments

Comments
 (0)