fix: adhoc metrics #30202
Open
fix: adhoc metrics #30202
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
villebro
reviewed
Sep 9, 2024
| @@ -1177,46 +1106,31 @@ class InsertRLSState(StrEnum): | |||
| FOUND_TABLE = "FOUND_TABLE" | |||
|
|
|||
|
|
|||
| def has_table_query(token_list: TokenList) -> bool: | |||
| def has_table_query(expression: str, engine: str) -> bool: | |||
There was a problem hiding this comment.
nit: I'd maybe using statement instead of expression in this context
There was a problem hiding this comment.
In this case it can be an actual expression, since we use for validating adhoc metrics — it could be COUNT(*), eg.
There was a problem hiding this comment.
Actually, let's rewrite this take a statement, and we can wrap it in a SELECT () where we have only an expression.
Comment on lines
-1201
to
-1217
| # Recurse into child token list | ||
| if isinstance(token, TokenList) and has_table_query(token): | ||
| return True | ||
|
|
||
| # Found a source keyword (FROM/JOIN) | ||
| if imt(token, m=[(Keyword, "FROM"), (Keyword, "JOIN")]): | ||
| state = InsertRLSState.SEEN_SOURCE | ||
|
|
||
| # Found identifier/keyword after FROM/JOIN | ||
| elif state == InsertRLSState.SEEN_SOURCE and ( | ||
| isinstance(token, sqlparse.sql.Identifier) or token.ttype == Keyword | ||
| ): | ||
| return True | ||
|
|
||
| # Found nothing, leaving source | ||
| elif state == InsertRLSState.SEEN_SOURCE and token.ttype != Whitespace: | ||
| state = InsertRLSState.SCANNING |
There was a problem hiding this comment.
Are these no longer needed for injecting RLS state?
There was a problem hiding this comment.
No, confusingly here we're just using the InsertRLSState enum do to the table scan.
(I also have a PR almost ready where I move all the RLS functions to sqlglot.)
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.
SUMMARY
Rewrite
has_table_queryto usesqlglotinstead ofsqlparse.Part of SIP-117.
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
N/A
TESTING INSTRUCTIONS
The current tests pass. Also added a regression that was not passing with
sqlparse.ADDITIONAL INFORMATION