- fix parsing macros in queries #74
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
|
|
andresmgot
reviewed
Oct 17, 2022
|
Got rid of the regex for parsing macros as suggested by @andresmgot |
andresmgot
approved these changes
Oct 18, 2022
sasklacz
force-pushed
the
parsing-macros
branch
from
f5449ef
to
4d7d073
Compare
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 was originally reported as a bug in clickhouse plugin grafana/clickhouse-datasource#195 . Whenever there are are multiple parentheses in the query, parser is having a hard time finding the end of the macro command.
This solution is maybe not the prettiest, but I think it's pretty solid. It first cleans up the input query from any empty spaces before the parentheses. Then it parses the query looking for macros with parentheses and adds an empty space at the last parenthesis, so that we can still use our original regex for finding the macro AND arguments (which is now bulletproof, as before it could grab a bracket belonging to a select, or other outer command).
Added new test cases and tested in clickhouse datasource plugin.
Do we update the version anywhere ?