pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 00:29:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Allow clickhouse dbs with timestamps to visualize queries (#21446)

Browse Source
This commit is contained in:
Hugh A. Miles II 2022-10-03 14:22:20 -04:00 committed by GitHub
parent 4245bc3f38
commit 4d0c2ba6ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
superset/models/helpers.py
View File

@ -1570,26 +1570,31 @@ class ExploreMixin: # pylint: disable=too-many-public-methods
groupby_all_columns[timestamp.name] = timestamp
# Use main dttm column to support index with secondary dttm columns.
if (
db_engine_spec.time_secondary_columns
and self.main_dttm_col in self.dttm_cols
and self.main_dttm_col != dttm_col.column_name
):
if isinstance(self.main_dttm_col, dict):
time_filters.append(
self.get_time_filter(
self.main_dttm_col,
from_dttm,
to_dttm,
)
)
if db_engine_spec.time_secondary_columns:
if isinstance(dttm_col, dict):
dttm_col_name = dttm_col.get("column_name")
else:
time_filters.append(
columns_by_name[self.main_dttm_col].get_time_filter(
from_dttm,
to_dttm,
dttm_col_name = dttm_col.column_name
if (
self.main_dttm_col in self.dttm_cols
and self.main_dttm_col != dttm_col_name
):
if isinstance(self.main_dttm_col, dict):
time_filters.append(
self.get_time_filter(
self.main_dttm_col,
from_dttm,
to_dttm,
)
)
else:
time_filters.append(
columns_by_name[self.main_dttm_col].get_time_filter(
from_dttm,
to_dttm,
)
)
)
if isinstance(dttm_col, dict):
time_filters.append(self.get_time_filter(dttm_col, from_dttm, to_dttm))