fix: MySQL slice shadowing database/sql import (#2332)

* fix: MySQL slice with database/sql type

Author: LudovicDebost

examples/booktest/sqlite/query.sql.go

@@ -120,7 +120,7 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
 
 {{define "queryCodeStdExec"}}
     {{- if .Arg.HasSqlcSlices }}
-        sql := {{.ConstantName}}
+        query := {{.ConstantName}}
         var queryParams []interface{}
         {{- if .Arg.Struct }}
             {{- $arg := .Arg }}
@@ -130,9 +130,9 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
                       for _, v := range {{$arg.Name}}.{{.Name}} {
                         queryParams = append(queryParams, v)
                       }
-                      sql = strings.Replace(sql, "/*SLICE:{{.Column.Name}}*/?", strings.Repeat(",?", len({{$arg.Name}}.{{.Name}}))[1:], 1)
+                      query = strings.Replace(query, "/*SLICE:{{.Column.Name}}*/?", strings.Repeat(",?", len({{$arg.Name}}.{{.Name}}))[1:], 1)
                     } else {
-                      sql = strings.Replace(sql, "/*SLICE:{{.Column.Name}}*/?", "NULL", 1)
+                      query = strings.Replace(query, "/*SLICE:{{.Column.Name}}*/?", "NULL", 1)
                     }
                 {{- else }}
                   queryParams = append(queryParams, {{$arg.Name}}.{{.Name}})
@@ -147,12 +147,12 @@ func (q *Queries) {{.MethodName}}(ctx context.Context, {{ dbarg }} {{.Arg.Pair}}
               for _, v := range {{.Arg.Name}} {
                 queryParams = append(queryParams, v)
               }
-              sql = strings.Replace(sql, "/*SLICE:{{.Arg.Column.Name}}*/?", strings.Repeat(",?", len({{.Arg.Name}}))[1:], 1)
+              query = strings.Replace(query, "/*SLICE:{{.Arg.Column.Name}}*/?", strings.Repeat(",?", len({{.Arg.Name}}))[1:], 1)
             } else {
-              sql = strings.Replace(sql, "/*SLICE:{{.Arg.Column.Name}}*/?", "NULL", 1)
+              query = strings.Replace(query, "/*SLICE:{{.Arg.Column.Name}}*/?", "NULL", 1)
             }
         {{- end }}
-        {{ queryRetval . }} {{ queryMethod . }}(ctx, sql, queryParams...)
+        {{ queryRetval . }} {{ queryMethod . }}(ctx, query, queryParams...)
     {{- else if emitPreparedQueries }}
         {{- queryRetval . }} {{ queryMethod . }}(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}})
     {{- else}}

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

@@ -1,4 +1,4 @@
-CREATE TABLE foo (id int not null, name text not null);
+CREATE TABLE foo (id int not null, name text not null, bar text null);
 
 /* name: FuncParamIdent :many */
 SELECT name FROM foo
@@ -17,3 +17,7 @@ WHERE id IN (sqlc.slice('favourites'));
 /* name: SliceExec :exec */
 UPDATE foo SET name = sqlc.arg(slug)
 WHERE id IN (sqlc.slice(favourites));
+
+/* name: FuncNullable :many */
+SELECT bar FROM foo
+WHERE id IN (sqlc.slice('favourites'));

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

@@ -1,4 +1,4 @@
-CREATE TABLE foo (id int not null, name text not null);
+CREATE TABLE foo (id int not null, name text not null, bar text);
 
 /* name: FuncParamIdent :many */
 SELECT name FROM foo
@@ -17,3 +17,7 @@ WHERE id IN (sqlc.slice('favourites'));
 /* name: SliceExec :exec */
 UPDATE foo SET name = sqlc.arg(slug)
 WHERE id IN (sqlc.slice(favourites));
+
+/* name: FuncNullable :many */
+SELECT bar FROM foo
+WHERE id IN (sqlc.slice('favourites'));