Fix outdated regex in BQL interval() function#280
Open
mlell wants to merge 1 commit intobeancount:masterfrom
Open
Fix outdated regex in BQL interval() function#280mlell wants to merge 1 commit intobeancount:masterfrom
mlell wants to merge 1 commit intobeancount:masterfrom
Conversation
The function pre-filtered the input string accepting only day, month, or year, while the function accepts more inputs. Change the regex to split only number from word.
Ev2geny
reviewed
May 11, 2026
| x = x.lower() | ||
| m = re.fullmatch(r'([-+]?[0-9]+)\s+([a-z]+?)s?', x) | ||
| if not m: | ||
| return None |
There was a problem hiding this comment.
Insted of returning None, would it not be better to raise some kind of syntax error (e.g. 'cannot match interval string with any of of allowed ones... ')
Ev2geny
reviewed
May 11, 2026
| if unit == 'millennium': | ||
| if unit in ['millennium', 'millenia']: | ||
| return relativedelta(years=number * 1000) | ||
| return None |
There was a problem hiding this comment.
Insted of returning None, would it not be better to raise some kind of syntax error (e.g. 'cannot match interval string with any of of allowed ones... ')
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The function pre-filtered the input string accepting only day, month, or year, while the function accepts more inputs. Change the regex to split only number from word.
Before:
Now: