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

fix: Ensure verbose mapping exists for SQL Lab Query model (#23597)

Browse Source
This commit is contained in:
John Bodley
2023-04-07 06:34:00 +12:00
committed by GitHub
parent e2e0ad5ef5
commit 83df609782
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
superset/charts/data/api.py
View File

@@ -18,7 +18,7 @@ from __future__ import annotations
import json
import logging
from typing import Any, Dict, Optional, TYPE_CHECKING
from typing import Any, Dict, Optional, TYPE_CHECKING, Union
import simplejson
from flask import current_app, make_response, request, Response
@@ -44,6 +44,7 @@ from superset.connectors.base.models import BaseDatasource
from superset.dao.exceptions import DatasourceNotFound
from superset.exceptions import QueryObjectValidationError
from superset.extensions import event_logger
from superset.models.sql_lab import Query
from superset.utils.async_query_manager import AsyncQueryTokenException
from superset.utils.core import create_zip, get_user_id, json_int_dttm_ser
from superset.views.base import CsvResponse, generate_download_headers, XlsxResponse
@@ -342,7 +343,7 @@ class ChartDataRestApi(ChartRestApi):
self,
result: Dict[Any, Any],
form_data: Optional[Dict[str, Any]] = None,
datasource: Optional[BaseDatasource] = None,
datasource: Optional[Union[BaseDatasource, Query]] = None,
) -> Response:
result_type = result["query_context"].result_type
result_format = result["query_context"].result_format
@@ -405,7 +406,7 @@ class ChartDataRestApi(ChartRestApi):
command: ChartDataCommand,
force_cached: bool = False,
form_data: Optional[Dict[str, Any]] = None,
datasource: Optional[BaseDatasource] = None,
datasource: Optional[Union[BaseDatasource, Query]] = None,
) -> Response:
try:
result = command.run(force_cached=force_cached)