fix: Rename argument when conflicted to imported package (#2048)

internal/codegen/golang/gen.go

@@ -94,7 +94,6 @@ func generate(req *plugin.CodeGenRequest, enums []Enum, structs []Struct, querie
 		SQLDriver:                 parseDriver(golang.SqlPackage),
 		Q:                         "`",
 		Package:                   golang.Package,
-		GoQueries:                 queries,
 		Enums:                     enums,
 		Structs:                   structs,
 		SqlcVersion:               req.SqlcVersion,
@@ -111,9 +110,13 @@ func generate(req *plugin.CodeGenRequest, enums []Enum, structs []Struct, querie
 	output := map[string]string{}
 
 	execute := func(name, templateName string) error {
+		imports := i.Imports(name)
+		replacedQueries := replaceConflictedArg(imports, queries)
+
 		var b bytes.Buffer
 		w := bufio.NewWriter(&b)
 		tctx.SourceName = name
+		tctx.GoQueries = replacedQueries
 		err := tmpl.ExecuteTemplate(w, templateName, &tctx)
 		w.Flush()
 		if err != nil {

internal/codegen/golang/imports.go

@@ -462,3 +462,22 @@ func trimSliceAndPointerPrefix(v string) string {
 	v = strings.TrimPrefix(v, "*")
 	return v
 }
+
+func replaceConflictedArg(imports [][]ImportSpec, queries []Query) []Query {
+	m := make(map[string]struct{})
+	for _, is := range imports {
+		for _, i := range is {
+			paths := strings.Split(i.Path, "/")
+			m[paths[len(paths)-1]] = struct{}{}
+		}
+	}
+
+	replacedQueries := make([]Query, 0, len(queries))
+	for _, query := range queries {
+		if _, exist := m[query.Arg.Name]; exist {
+			query.Arg.Name = toCamelCase(fmt.Sprintf("arg_%s", query.Arg.Name))
+		}
+		replacedQueries = append(replacedQueries, query)
+	}
+	return replacedQueries
+}

internal/endtoend/testdata/conflicted_arg_name/postgresql/query.sql

@@ -0,0 +1,12 @@
+CREATE TABLE foo (
+  time date NOT NULL,
+  time2 date NOT NULL,
+  uuid uuid NOT NULL,
+  uuid2 uuid NOT NULL
+);
+
+-- name: Time2ByTime :one
+SELECT time2 FROM foo WHERE time=$1;
+
+-- name: Uuid2ByUuid :one
+SELECT uuid2 FROM foo WHERE uuid=$1;

internal/endtoend/testdata/conflicted_arg_name/postgresql/sqlc.json

@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "db",
+      "engine": "postgresql",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}