-
Notifications
You must be signed in to change notification settings - Fork 884
feat(codegen): Remove Go-specific overrides from codegen proto #2929
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.
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
Conversation
This file contains hidden or 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
@@ -156,6 +122,7 @@ message CodeGenRequest { | |||
repeated Query queries = 3 [json_name = "queries"]; | |||
string sqlc_version = 4 [json_name = "sqlc_version"]; | |||
bytes plugin_options = 5 [json_name = "plugin_options"]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sadly this should probably be queryset_options
but not worth changing.
andrewmbenton
requested changes
Oct 31, 2023
internal/cmd/generate.go
Outdated
if found { | ||
opts, err := convert.YAMLtoJSON(global) | ||
if err != nil { | ||
return "", nil, fmt.Errorf("invalid plugin options") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
probably should have %w
in here to give user some idea of what the error was
andrewmbenton
approved these changes
Oct 31, 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.
As part of our long-term plans for additional languages, we're cleaning up the interface between sqlc and codegen plugins. This change removes the rename and overrides struct, as it had Go-specific information. In it's place is a plugin-agnostic global options block. The current Go-specific configuration looks like this:
A two line change to use this with a theoretical Go plugin
Supersedes #2918