Update copied changes from sqlds #862
Merged
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
njvrzm
force-pushed
the
858-changes_from_sqlds
branch
3 times, most recently
from
161bbd3
to
ce99188
Compare
njvrzm
force-pushed
the
858-changes_from_sqlds
branch
from
ce99188
to
a811d12
Compare
njvrzm
requested review from
gabor,
yesoreyeram,
zoltanbedi,
wbrowne,
marefr,
xnyo and
gwdawson
and removed request for
a team,
zoltanbedi,
wbrowne,
marefr,
xnyo and
yesoreyeram
gabor
reviewed
Jan 18, 2024
| if err != nil { | ||
| return rawSQL, err | ||
| } | ||
|
|
||
| rawSQL = strings.ReplaceAll(rawSQL, match[0], res) | ||
| rawSQL = strings.ReplaceAll(rawSQL, match.Name, res) |
There was a problem hiding this comment.
random note, this is not part of the diff.. here we use ReplaceAll().
in sqlds, it's Replace():
https://github.com/grafana/sqlds/blob/dda2dc0a54b128961fc9f7885baabf555f3ddfdc/macros.go#L258
what do you think, which one is "more correct"?
There was a problem hiding this comment.
Ah, I actually made the change intentionally in my original PR; this time around I forgot, but then the linter in this repo told me to change it! Looks like this comes from gocritic:
❯ mage lint
data/sqlutil/macros.go:215:13: wrapperFunc: use strings.ReplaceAll method in `strings.Replace(rawSQL, match.full, res, -1)` (gocritic)
rawSQL = strings.Replace(rawSQL, match.full, res, -1)
^
Error: running "golangci-lint run ./..." failed with exit code 1
I also prefer ReplaceAll as I think it makes the intention more clear, but it's a pretty minor thing.
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.
What this PR does / why we need it:
Functionality from
sqlds/macros.goandsqlds/query.gowas brought into this repo'ssqlutilas part of https://github.com/grafana/oss-plugin-partnerships/issues/94. Since then some features and bugfixes have been added to the originals. These changes need to be brought in to sqlutil as well to bring the functionality here up to date, so sqlds can be migrated to use this library instead of its own versions (grafana/sqlds#85).For this PR I've tried as much as possible to copy the
sqldscode over unchanged. #863 applies some refactoring and fixes a couple of bugs.Which issue(s) this PR fixes:
Addresses #858.