-
Notifications
You must be signed in to change notification settings - Fork 13.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add support for comments in adhoc clauses #19248
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9fac15d
feat: add support for comments in adhoc clauses
villebro 9e9b93e
sanitize remaining freeform clauses
villebro 843ece3
sanitize adhoc having in frontend
villebro 2c85acb
Merge branch 'master' into villebro/adhoc-comment
villebro 3aabb7c
address review comment
villebro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,6 +32,7 @@ | |
Where, | ||
) | ||
from sqlparse.tokens import ( | ||
Comment, | ||
CTE, | ||
DDL, | ||
DML, | ||
|
@@ -441,25 +442,35 @@ def set_or_update_query_limit(self, new_limit: int, force: bool = False) -> str: | |
return str_res | ||
|
||
|
||
def validate_filter_clause(clause: str) -> None: | ||
if sqlparse.format(clause, strip_comments=True) != sqlparse.format(clause): | ||
raise QueryClauseValidationException("Filter clause contains comment") | ||
|
||
def sanitize_clause(clause: str) -> str: | ||
# clause = sqlparse.format(clause, strip_comments=True) | ||
statements = sqlparse.parse(clause) | ||
if len(statements) != 1: | ||
raise QueryClauseValidationException("Filter clause contains multiple queries") | ||
raise QueryClauseValidationException("Clause contains multiple statements") | ||
open_parens = 0 | ||
|
||
previous_token = None | ||
for token in statements[0]: | ||
if token.value == "/" and previous_token and previous_token.value == "*": | ||
raise QueryClauseValidationException("Closing unopened multiline comment") | ||
if token.value == "*" and previous_token and previous_token.value == "/": | ||
raise QueryClauseValidationException("Unclosed multiline comment") | ||
if token.value in (")", "("): | ||
open_parens += 1 if token.value == "(" else -1 | ||
if open_parens < 0: | ||
raise QueryClauseValidationException( | ||
"Closing unclosed parenthesis in filter clause" | ||
) | ||
previous_token = token | ||
if open_parens > 0: | ||
raise QueryClauseValidationException("Unclosed parenthesis in filter clause") | ||
|
||
if previous_token and previous_token.ttype in Comment: | ||
if previous_token.value[-1] != "\n": | ||
clause = f"{clause}\n" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah, I see it is done in the backend. But I still don't understand why we also do this in the frontend? |
||
|
||
return clause | ||
|
||
|
||
class InsertRLSState(str, Enum): | ||
""" | ||
|
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be done on backend, no?