internal/codegen/golang: omit unused structs from output #2369
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kyleconroy
requested changes
Jun 27, 2023
internal/codegen/golang/gen.go
Outdated
Comment on lines
300
to
317
| for _, query := range queries { | ||
| if !query.Arg.isEmpty() { | ||
| keepTypes[strings.TrimPrefix(query.Arg.Type(), "Null")] = struct{}{} | ||
| if query.Arg.IsStruct() { | ||
| for _, field := range query.Arg.Struct.Fields { | ||
| keepTypes[strings.TrimPrefix(field.Type, "Null")] = struct{}{} | ||
| } | ||
| } | ||
| } | ||
| if query.hasRetType() { | ||
| keepTypes[strings.TrimPrefix(query.Ret.Type(), "Null")] = struct{}{} | ||
| if query.Ret.IsStruct() { | ||
| for _, field := range query.Ret.Struct.Fields { | ||
| keepTypes[strings.TrimPrefix(field.Type, "Null")] = struct{}{} | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
The trimming behavior here has a subtle bug. Type names come from user-defined table names. A table named null_foo will have a struct named NullFoo. Instead of trimming the null prefix, The enum code below should check for any use of the enum struct or the nullable enum struct.
There was a problem hiding this comment.
Good point, will update
…ctly handle nullable enum types
andrewmbenton
force-pushed
the
andrew/omit-unused-structs
branch
from
4454e78 to
4ac6049
Compare
kyleconroy
approved these changes
Jun 27, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a feature that has been requested from time to time, most-recently in #2336.
This implementation introduces a new configuration parameter
omit_unused_structswhich, when set totrue, prevents inclusion of table and enum structs that aren't used in queries for a given package.Closes #710