Skip to content

Commit

Permalink
fix(codegen/go): Prevent filtering of embedded struct fields (#2868)
Browse files Browse the repository at this point in the history
Resolves #2860
  • Loading branch information
andrewmbenton committed Oct 17, 2023
1 parent 2de390d commit bd46afa
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 2 deletions.
3 changes: 3 additions & 0 deletions internal/codegen/golang/gen.go
Original file line number Diff line number Diff 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

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

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

Original file line number Diff line number Diff 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;
Original file line number Diff line number Diff 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
)

0 comments on commit bd46afa

Please sign in to comment.