The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Clean up Python SQL tools code (#85893)
Alexander Polyankincc16b0c9e804
diff --git a/resources/python-sources/sql_tools.py b/resources/python-sources/sql_tools.pyindex 46055edc5b5..61a636eb370 100644--- a/resources/python-sources/sql_tools.py+++ b/resources/python-sources/sql_tools.py@@ -2046,7 +2046,7 @@ _TSQL_STATEMENT_WORDS = frozenset(_MYSQL_FAMILY_DIALECTS = frozenset({"mysql", "mariadb", "singlestore", "starrocks", "doris", "tidb"})-def _hidden_sql(sql: str, dialect: str):+def _hidden_sql(sql: str, dialect: str, select: bool):"""`(reason, detail)` when `sql` holds text its database would run and sqlglot would not parse as a statement ofits own, else None.@@ -2058,10 +2058,13 @@ def _hidden_sql(sql: str, dialect: str):A `U&"..."` identifier is refused in every dialect. Postgres reads its escapes, so `U&"pg_\\0073leep"` names`pg_sleep`, and sqlglot keeps them, so the function checks above never see the name. Like the MySQL marks, it islooked for in the raw text.++ The T-SQL statement words are looked for only when `select` says the statement is a SELECT, since a write+ statement starts with one."""if re.search(r"(?<![\w\$])[uU]&\"", sql) is not None:return ("unicode-identifier", None)- if dialect == "tsql":+ if dialect == "tsql" and select:quoted = (sqlglot.TokenType.STRING, sqlglot.TokenType.NATIONAL_STRING, sqlglot.TokenType.IDENTIFIER)for tok in sqlglot.tokenize(sql, read=dialect):if tok.token_type not in quoted and tok.text.upper() in _TSQL_STATEMENT_WORDS:@@ -2083,6 +2086,19 @@ def _unbracketed(stmt: exp.Expression) -> exp.Expression:return stmt+def _statement_reason(stmt: exp.Expression, sql: str, dialect: str):+ """`(reason, detail)` for why `stmt`, parsed from `sql`, fails the checks every statement type shares, else None."""+ function = _session_effect_function(stmt)+ if function is not None:+ return ("session-function", function)+ executor = _sql_executing_function(stmt)+ if executor is not None:+ return ("sql-executing-function", executor)+ if _dynamic_function_call(stmt):+ return ("dynamic-function-call", None)+ return _hidden_sql(sql, dialect, isinstance(_unbracketed(stmt), (exp.Select, exp.SetOperation)))++def _not_read_only_reason(stmts, sql: str, dialect: str):"""`(reason, detail)` for why `stmts`, parsed from `sql`, are not one read-only SELECT, else None."""if not stmts:@@ -2093,24 +2109,17 @@ def _not_read_only_reason(stmts, sql: str, dialect: str):return ("not-a-select", None)if not _read_only(stmts[0]):return ("writes-or-locks", None)- function = _session_effect_function(stmts[0])- if function is not None:- return ("session-function", function)- executor = _sql_executing_function(stmts[0])- if executor is not None:- return ("sql-executing-function", executor)- if _dynamic_function_call(stmts[0]):- return ("dynamic-function-call", None)- return _hidden_sql(sql, dialect)+ return _statement_reason(stmts[0], sql, dialect)def is_single_stmt_of_type(sql: str, stmt_type: str = "read", dialect: str = None) -> str:"""Validates that a query is a single read statement (SELECT) or a single write statement (INSERT, UPDATE, DELETE)and returns the query reconstructed from the parsed AST.+ Every mode applies the checks the statement types share.`stmt_type` "read-only" is stricter than "read": the SELECT must also hold nothing that writes or locks anywhere in- its tree, and statements holding only a comment after the last semicolon are not counted. When the SQL is not a- read-only SELECT, `reason` says why, with `reason_detail` for the reasons that have one.+ its tree, and statements holding only a comment after the last semicolon are not counted. When the statement is+ refused for what it holds, `reason` says why, with `reason_detail` for the reasons that have one."""result = {"is_single_stmt?": False, "allowed_stmt_type?": False}try:@@ -2120,7 +2129,12 @@ def is_single_stmt_of_type(sql: str, stmt_type: str = "read", dialect: str = Nonstmts = _nonempty_statements(stmts)elif stmt_type != "read":allowed_types = (exp.Update, exp.Insert, exp.Delete)- problem = _not_read_only_reason(stmts, sql, dialect) if stmt_type == "read-only" else None+ if stmt_type == "read-only":+ problem = _not_read_only_reason(stmts, sql, dialect)+ elif len(stmts) == 1:+ problem = _statement_reason(stmts[0], sql, dialect)+ else:+ problem = Noneif problem is not None:result["reason"], result["reason_detail"] = problemif len(stmts) == 1: