mirror of
https://github.com/apache/superset.git
synced 2026-04-19 08:04:53 +00:00
fix(query): pass datasource table to template processor for schema-aware Jinja rendering (#38984)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
committed by
GitHub
parent
64c8d652e1
commit
94d8735d4b
@@ -344,7 +344,9 @@ class QueryObject: # pylint: disable=too-many-instance-attributes
|
||||
if clause and self.datasource:
|
||||
try:
|
||||
database = self.datasource.database
|
||||
processor = get_template_processor(database=database)
|
||||
processor = get_template_processor(
|
||||
database=database, table=self.datasource
|
||||
)
|
||||
try:
|
||||
clause = processor.process_template(clause, force=True)
|
||||
except TemplateError as ex:
|
||||
|
||||
@@ -1257,7 +1257,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
|
||||
|
||||
if parse_boolean_string(request.args.get("include_rendered_sql")):
|
||||
try:
|
||||
processor = get_template_processor(database=table.database)
|
||||
processor = get_template_processor(database=table.database, table=table)
|
||||
response["result"] = self.render_dataset_fields(
|
||||
response["result"], processor
|
||||
)
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
# under the License.
|
||||
|
||||
from typing import Any
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
from sqlalchemy.orm.session import Session
|
||||
|
||||
@@ -72,3 +73,50 @@ def test_put_invalid_dataset(
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
def test_get_dataset_include_rendered_sql_passes_table_to_template_processor(
|
||||
session: Session,
|
||||
client: Any,
|
||||
full_api_access: None,
|
||||
) -> None:
|
||||
"""
|
||||
Dataset API: Test that include_rendered_sql passes the table
|
||||
to get_template_processor.
|
||||
|
||||
Regression test for the bug where get_template_processor was called without
|
||||
the `table` argument, leaving self._schema as None in processors like
|
||||
PrestoTemplateProcessor and causing NPEs when templates reference partition
|
||||
functions without an explicit schema.
|
||||
"""
|
||||
from superset.connectors.sqla.models import SqlaTable
|
||||
from superset.models.core import Database
|
||||
|
||||
SqlaTable.metadata.create_all(db.session.get_bind())
|
||||
|
||||
database = Database(
|
||||
database_name="my_db",
|
||||
sqlalchemy_uri="sqlite://",
|
||||
)
|
||||
dataset = SqlaTable(
|
||||
table_name="test_render_sql_table",
|
||||
schema="my_schema",
|
||||
database=database,
|
||||
sql="SELECT 1",
|
||||
)
|
||||
db.session.add(dataset)
|
||||
db.session.flush()
|
||||
|
||||
mock_processor = MagicMock()
|
||||
mock_processor.process_template.return_value = "SELECT 1"
|
||||
|
||||
with patch(
|
||||
"superset.datasets.api.get_template_processor",
|
||||
return_value=mock_processor,
|
||||
) as mock_get_processor:
|
||||
response = client.get(
|
||||
f"/api/v1/dataset/{dataset.id}?include_rendered_sql=true",
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
mock_get_processor.assert_called_once_with(database=database, table=dataset)
|
||||
|
||||
Reference in New Issue
Block a user