fix(codegen): Prevent variable redeclaration in single param conflict (#1298)

Author: timstudd

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

@@ -34,7 +34,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{.Arg.Pair}}) ({{.Ret.De
 	{{- else -}}
 	row := q.db.QueryRowContext(ctx, {{.ConstantName}}, {{.Arg.Params}})
 	{{- end}}
+	{{- if ne .Arg.Pair .Ret.Pair }}
 	var {{.Ret.Name}} {{.Ret.Type}}
+	{{- end}}
 	err := row.Scan({{.Ret.Scan}})
 	return {{.Ret.ReturnName}}, err
 }

internal/endtoend/testdata/single_param_conflict/mysql/go/db.go

@@ -0,0 +1,29 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   BIGINT PRIMARY KEY,
+  name TEXT      NOT NULL,
+  bio  text
+);
+
+-- name: GetAuthorIDByID :one
+SELECT  id
+FROM    authors
+WHERE   id = ?
+LIMIT   1;
+
+-- name: GetAuthorByID :one
+SELECT  id, name, bio
+FROM    authors
+WHERE   id = ?
+LIMIT   1;
+
+-- https://github.com/kyleconroy/sqlc/issues/1290
+CREATE TABLE users (
+  sub TEXT PRIMARY KEY
+);
+
+-- name: GetUser :one
+SELECT  sub
+FROM    users
+WHERE   sub = ?
+LIMIT   1;

internal/endtoend/testdata/single_param_conflict/mysql/go/models.go

@@ -0,0 +1,12 @@
+{
+	"version": "1",
+	"packages": [
+		{
+			"engine": "mysql",
+			"path": "go",
+			"name": "querytest",
+			"schema": "query.sql",
+			"queries": "query.sql"
+		}
+	]
+}

internal/endtoend/testdata/single_param_conflict/mysql/go/query.sql.go

@@ -0,0 +1,37 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name TEXT      NOT NULL,
+  bio  text
+);
+
+-- name: GetAuthorIDByID :one
+SELECT  id
+FROM    authors
+WHERE   id = $1
+LIMIT   1;
+
+-- name: GetAuthorByID :one
+SELECT  id, name, bio
+FROM    authors
+WHERE   id = $1
+LIMIT   1;
+
+-- https://github.com/kyleconroy/sqlc/issues/1290
+CREATE TABLE users (
+  sub UUID PRIMARY KEY
+);
+
+-- name: GetUser :one
+SELECT  sub
+FROM    users
+WHERE   sub = $1
+LIMIT   1;
+
+-- https://github.com/kyleconroy/sqlc/issues/1235
+
+-- name: SetDefaultName :one
+UPDATE  authors
+SET     name = "Default Name"
+WHERE   id = $1
+RETURNING id;

internal/endtoend/testdata/single_param_conflict/mysql/query.sql

@@ -0,0 +1,12 @@
+{
+	"version": "1",
+	"packages": [
+		{
+			"engine": "postgresql",
+			"path": "go",
+			"name": "querytest",
+			"schema": "query.sql",
+			"queries": "query.sql"
+		}
+	]
+}