fix(codegen/golang): Don't import "strings" for sqlc.slice() with…

… pgx (#3073) Also fix the invalid test that should have caught this Resolves #3065
sqlc-dev · Dec 20, 2023 · ce95162 · ce95162
1 parent f0184bc
commit ce95162
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/internal/codegen/golang/imports.go b/internal/codegen/golang/imports.go
@@ -390,7 +390,7 @@ func (i *importer) queryImports(filename string) fileImports {
 	}
 
 	sqlpkg := parseDriver(i.Options.SqlPackage)
-	if sqlcSliceScan() {
+	if sqlcSliceScan() && !sqlpkg.IsPGX() {
 		std["strings"] = struct{}{}
 	}
 	if sliceScan() && !sqlpkg.IsPGX() {

diff --git a/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/models.go b/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/models.go
diff --git a/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/query.sql.go
diff --git a/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/query.sql b/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/query.sql
@@ -1,5 +1,7 @@
 -- name: FuncParamIdent :many
-SELECT name FROM foo WHERE name = sqlc.arg(slug);
+SELECT name FROM foo WHERE name = sqlc.arg(slug)
+  AND id IN (sqlc.slice(favourites));
 
 -- name: FuncParamString :many
-SELECT name FROM foo WHERE name = sqlc.arg('slug');
+SELECT name FROM foo WHERE name = sqlc.arg('slug')
+  AND id IN (sqlc.slice('favourites'));
diff --git a/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/schema.sql b/internal/endtoend/testdata/sqlc_slice/postgresql/pgx/schema.sql
@@ -1,2 +1,2 @@
-CREATE TABLE foo (name text not null);
+CREATE TABLE foo (id int not null, name text not null);
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		CREATE TABLE foo (name text not null);
		CREATE TABLE foo (id int not null, name text not null);