suddjian commented on a change in pull request #19248:
URL: https://github.com/apache/superset/pull/19248#discussion_r830372694
##########
File path: superset/sql_parse.py
##########
@@ -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"
Review comment:
Ah, I see it is done in the backend. But I still don't understand why we
also do this in the frontend?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org
For additional commands, e-mail: notifications-h...@superset.apache.org
