Skip to content

Commit

Permalink
fix(golang): Prevent duplicate enum output (#2447)
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleconroy authored Jul 13, 2023
1 parent a60acbf commit 6051c03
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 10 deletions.
7 changes: 3 additions & 4 deletions internal/codegen/golang/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,9 @@ func filterUnusedStructs(enums []Enum, structs []Struct, queries []Query) ([]Enu

keepEnums := make([]Enum, 0, len(enums))
for _, enum := range enums {
if _, ok := keepTypes[enum.Name]; ok {
keepEnums = append(keepEnums, enum)
}
if _, ok := keepTypes["Null"+enum.Name]; ok {
_, keep := keepTypes[enum.Name]
_, keepNull := keepTypes["Null"+enum.Name]
if keep || keepNull {
keepEnums = append(keepEnums, enum)
}
}
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 @@ -2,7 +2,7 @@
SELECT * FROM query_return_full_table;

-- name: query_param_enum_table :one
SELECT id FROM query_param_enum_table WHERE value = $1;
SELECT * FROM query_param_enum_table WHERE value = $1;

-- name: query_param_struct_enum_table :one
SELECT id FROM query_param_struct_enum_table WHERE id = $1 AND value = $2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ CREATE TYPE query_param_enum_table_enum AS ENUM (
);
CREATE TABLE query_param_enum_table (
id INTEGER PRIMARY KEY,
other query_param_enum_table_enum NOT NULL,
value query_param_enum_table_enum
);

Expand Down

0 comments on commit 6051c03

Please sign in to comment.