Consistent whitespace handling in Go query template #1301
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
kyleconroy
requested changes
Nov 21, 2021
e081575 to
e7570ab
Compare
|
Added a test which generates the different kinds of queries using |
kyleconroy
approved these changes
Nov 24, 2021
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 PR reverts an extra line of whitespace in generated output which snuck in with #1279. This only applied to :execrows using prepared queries, where in one conditional branch there were two spots where whitespace wasn't removed, versus a single spot for the other branches.
… {{end -}} // leading whitespace here {{- if $.EmitPreparedQueries}} // trailing whitespace here result, err := q.exec(ctx, q.{{.FieldName}}, {{.ConstantName}}, {{.Arg.Params}}) {{- else if $.EmitMethodsWithDBArgument -}} // no trailing whitespace here …Rather than try to add tests for all of the possible configurations in this pull request, I've made sure all the branches in if/else constructs in the template use consistent whitespace escapes so that if there's extra whitespace it will show up in tests regardless of what branch is taken.