This is an automated email from the ASF dual-hosted git repository. lyndsi pushed a commit to branch lyndsi/sql-lab-new-explore-button-functionality-and-move-save-dataset-to-split-save-button in repository https://gitbox.apache.org/repos/asf/superset.git
commit c6f3f3c6b76bbc82839b51d34b9e23220d82b26b Author: AAfghahi <[email protected]> AuthorDate: Tue Jul 5 12:29:16 2022 -0400 core_test fix --- superset/utils/core.py | 12 +++++++++--- tests/integration_tests/charts/data/api_tests.py | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/superset/utils/core.py b/superset/utils/core.py index f76995fb32..3278aa80a7 100644 --- a/superset/utils/core.py +++ b/superset/utils/core.py @@ -1737,9 +1737,15 @@ def get_time_filter_status( # pylint: disable=too-many-branches applied_time_extras: Dict[str, str], ) -> Tuple[List[Dict[str, str]], List[Dict[str, str]]]: - # todo(hugh): fix this - # temporal_columns = {col.column_name for col in datasource.columns if col.is_dttm} - temporal_columns: Dict[str, Any] = {} + temporal_columns: Set[Any] + if datasource.type == "query": + temporal_columns = { + col.get("column_name") for col in datasource.columns if col.get("is_dttm") + } + else: + temporal_columns = { + col.column_name for col in datasource.columns if col.is_dttm + } applied: List[Dict[str, str]] = [] rejected: List[Dict[str, str]] = [] time_column = applied_time_extras.get(ExtraFiltersTimeColumnType.TIME_COL) diff --git a/tests/integration_tests/charts/data/api_tests.py b/tests/integration_tests/charts/data/api_tests.py index 683e3f9b0d..67b9826d26 100644 --- a/tests/integration_tests/charts/data/api_tests.py +++ b/tests/integration_tests/charts/data/api_tests.py @@ -332,6 +332,7 @@ class TestPostChartDataApi(BaseTestChartDataApi): {"column": "gender"}, {"column": "num"}, {"column": "name"}, + {"column": "__time_range"}, ], ) expected_row_count = self.get_expected_row_count("client_id_2")
