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

kyleconroy merged 2 commits intosqlc-dev:mainsqlc-dev/sqlc:mainfrom

timstudd:fix/variable-redeclaration-in-single-param-conflicttimstudd/sqlc:fix/variable-redeclaration-in-single-param-conflictCopy head branch name to clipboard