Skip to content

fix(codegen/go): Prevent filtering of embedded struct fields#2868

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
andrewmbenton merged 1 commit into from
Oct 17, 2023
Merged

fix(codegen/go): Prevent filtering of embedded struct fields #2868

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
3 changes: 3 additions & 0 deletions internal/codegen/golang/gen.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -345,6 +345,9 @@ func filterUnusedStructs(enums []Enum, structs []Struct, queries []Query) ([]Enu
if query.Ret.IsStruct(){
for _, field := range query.Ret.Struct.Fields{
keepTypes[field.Type] = struct{}{}
for _, embedField := range field.EmbedFields{
keepTypes[embedField.Type] = struct{}{}
}
}
}
}
Expand Down
47 changes: 47 additions & 0 deletions internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/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.

15 changes: 15 additions & 0 deletions internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/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.

5 changes: 4 additions & 1 deletion internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,4 +11,7 @@ SELECT id FROM query_param_struct_enum_table WHERE id = $1 AND value = $2;
SELECT value FROM query_return_enum_table WHERE id = $1;

-- name: query_return_struct_enum_table :one
SELECT value, another FROM query_return_struct_enum_table WHERE id = $1;
SELECT value, another FROM query_return_struct_enum_table WHERE id = $1;

-- name: query_sqlc_embed_table :one
SELECT sqlc.embed(query_sqlc_embed_table) FROM query_sqlc_embed_table WHERE id = $1;
10 changes: 9 additions & 1 deletion internal/endtoend/testdata/omit_unused_structs/postgresql/stdlib/schema.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,4 +50,12 @@ CREATE TABLE query_return_struct_enum_table (
id INTEGER PRIMARY KEY,
value query_return_struct_enum_table_enum,
another INTEGER
);
);

CREATE TYPE query_sqlc_embed_enum AS ENUM (
'm', 'n'
);
CREATE TABLE query_sqlc_embed_table (
id INTEGER PRIMARY KEY,
value query_sqlc_embed_enum
)