Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion internal/codegen/golang/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,26 @@ func buildQueries(req *plugin.GenerateRequest, options *opts.Options, structs []
c := query.Columns[0]
name := columnName(c, 0)
name = strings.Replace(name, "$", "_", -1)
retName := escape(name)
// For :one queries the scan destination lives in the same scope as
// the query parameters, so reusing a parameter's name would cause
// Scan to overwrite the input and leak it back to the caller on
// sql.ErrNoRows (see sqlc-dev/sqlc#4354). Rename the return
// variable when it would collide.
if query.Cmd == metadata.CmdOne {
argNames := map[string]struct{}{}
for _, p := range gq.Arg.Pairs() {
argNames[p.Name] = struct{}{}
}
for {
if _, conflict := argNames[retName]; !conflict {
break
}
retName += "_2"
}
}
gq.Ret = QueryValue{
Name: escape(name),
Name: retName,
DBName: name,
Typ: goType(req, options, c),
SQLDriver: sqlpkg,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions internal/endtoend/testdata/vet_explain/mysql/db/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading