QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-07 18:35:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Leverage actual database for rendering Jinjarized SQL (#27646)

Browse Source
This commit is contained in:
John Bodley
2024-03-27 08:12:25 +13:00
committed by GitHub
parent ed9e542781
commit 28cbedb82f
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
superset/sql_parse.py
View File

@@ -25,8 +25,7 @@ import re
import urllib.parse
from collections.abc import Iterable, Iterator
from dataclasses import dataclass
from typing import Any, cast, Generic, TypeVar
from unittest.mock import Mock
from typing import Any, cast, Generic, TYPE_CHECKING, TypeVar
import sqlglot
import sqlparse
@@ -75,6 +74,9 @@ try:
except (ImportError, ModuleNotFoundError):
sqloxide_parse = None
if TYPE_CHECKING:
from superset.models.core import Database
RESULT_OPERATIONS = {"UNION", "INTERSECT", "EXCEPT", "SELECT"}
ON_KEYWORD = "ON"
PRECEDES_TABLE_NAME = {"FROM", "JOIN", "DESCRIBE", "WITH", "LEFT JOIN", "RIGHT JOIN"}
@@ -1509,7 +1511,7 @@ def extract_table_references(
}
def extract_tables_from_jinja_sql(sql: str, engine: str | None = None) -> set[Table]:
def extract_tables_from_jinja_sql(sql: str, database: Database) -> set[Table]:
"""
Extract all table references in the Jinjafied SQL statement.
@@ -1522,7 +1524,7 @@ def extract_tables_from_jinja_sql(sql: str, engine: str | None = None) -> set[Ta
SQLGlot.
:param sql: The Jinjafied SQL statement
:param engine: The associated database engine
:param database: The database associated with the SQL statement
:returns: The set of tables referenced in the SQL statement
:raises SupersetSecurityException: If SQLGlot is unable to parse the SQL statement
"""
@@ -1531,8 +1533,7 @@ def extract_tables_from_jinja_sql(sql: str, engine: str | None = None) -> set[Ta
get_template_processor,
)
# Mock the required database as the processor signature is exposed publically.
processor = get_template_processor(database=Mock(backend=engine))
processor = get_template_processor(database)
template = processor.env.parse(sql)
tables = set()
@@ -1562,6 +1563,6 @@ def extract_tables_from_jinja_sql(sql: str, engine: str | None = None) -> set[Ta
tables
| ParsedQuery(
sql_statement=processor.process_template(template),
engine=engine,
engine=database.db_engine_spec.engine,
).tables
)