OptionallyDelimited Grammar #6837
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
Coverage Results ✅ |
alanmcruickshank
requested changes
Apr 24, 2025
Comment on lines
217
to
233
| super().__init__( | ||
| *args, | ||
| Delimited( | ||
| *args, | ||
| delimiter=delimiter, | ||
| allow_trailing=allow_trailing, | ||
| terminators=terminators, | ||
| reset_terminators=reset_terminators, | ||
| min_delimiters=min_delimiters, | ||
| bracket_pairs_set=bracket_pairs_set, | ||
| allow_gaps=allow_gaps, | ||
| optional=optional, | ||
| ), | ||
| terminators=terminators, | ||
| reset_terminators=reset_terminators, | ||
| allow_gaps=allow_gaps, | ||
| optional=optional, |
There was a problem hiding this comment.
Doing it this way means that we can now parse:
ALTER USER "John" SET DEFAULT_ROLE = JOHNNY DEFAULT_WAREHOUSE = FEU COMMENT = "Foo";
ALTER USER "John" SET DEFAULT_ROLE = JOHNNY, DEFAULT_WAREHOUSE = FEU, COMMENT = "Foo";But if there's a mix of commas and space delimiters, then it will fail 🤔 . e.g.
ALTER USER "John" SET DEFAULT_ROLE = JOHNNY DEFAULT_WAREHOUSE = FEU, COMMENT = "Foo";I realise it's an edge case in an edge case, but I wonder if we need a different approach. In the Delimited grammar, the section of code which looks for delimiters or content is fairly compact, and it probably wouldn't be crazy to extent that to search optionally for both if configured that way.
There was a problem hiding this comment.
Yeah, that's a fair point. I suppose we just need to change the matching algorithm in Delimited() to depend on a variable to set in OptionallyDelimited(). I think that shouldn't be all that hard actually
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.
Brief summary of the change made
Create OptionallyDelimited grammar, and implement its first use case.
Fixes #6824
Are there any other side effects of this change that we should be aware of?
No
Pull Request checklist
Please confirm you have completed any of the necessary steps below.
Included test cases to demonstrate any code changes, which may be one or more of the following:
.ymlrule test cases intest/fixtures/rules/std_rule_cases..sql/.ymlparser test cases intest/fixtures/dialects(note YML files can be auto generated withtox -e generate-fixture-yml).test/fixtures/linter/autofix.Added appropriate documentation for the change.
Created GitHub issues for any relevant followup/future enhancements if appropriate.