Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/codegen/golang/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func (i *importer) queryImports(filename string) fileImports {
}

sqlpkg := parseDriver(i.Options.SqlPackage)
if sqlcSliceScan() {
if sqlcSliceScan() && !sqlpkg.IsPGX() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:( so gross

std["strings"] = struct{}{}
}
if sliceScan() && !sqlpkg.IsPGX() {
Expand Down
1 change: 1 addition & 0 deletions internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/models.go
View file
Open in desktop

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

20 changes: 16 additions & 4 deletions internal/endtoend/testdata/sqlc_slice/postgresql/pgx/go/query.sql.go
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions internal/endtoend/testdata/sqlc_slice/postgresql/pgx/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'));
2 changes: 1 addition & 1 deletion internal/endtoend/testdata/sqlc_slice/postgresql/pgx/schema.sql
View file
Open in desktop
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);