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

Fixing issue #1689 (#1696)

Browse Source
This commit is contained in:
Maxime Beauchemin 2016-11-28 16:25:09 -08:00 committed by GitHub
parent b7019ad4f3
commit 1c429b27bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
superset/models.py
View File

@ -1063,9 +1063,9 @@ class SqlaTable(Model, Queryable, AuditMixinNullable, ImportMixin):
dttm_col = cols[granularity]
time_grain = extras.get('time_grain_sqla')
timestamp = dttm_col.get_timestamp_expression(time_grain)
if is_timeseries:
timestamp = dttm_col.get_timestamp_expression(time_grain)
select_exprs += [timestamp]
groupby_exprs += [timestamp]
@ -1119,7 +1119,7 @@ class SqlaTable(Model, Queryable, AuditMixinNullable, ImportMixin):
qry = qry.limit(row_limit)
if timeseries_limit and groupby:
if is_timeseries and timeseries_limit and groupby:
# some sql dialects require for order by expressions
# to also be in the select clause
inner_select_exprs += [main_metric_expr]