pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: revert "feat(sqla): apply time grain to all temporal groupbys" (#17239) 

* Revert "feat(sqla): apply time grain to all temporal groupbys (#16318)"

This reverts commit 9075e4206c.

* Update models.py
This commit is contained in:
John Bodley 2021-10-29 11:57:58 -07:00 committed by GitHub
parent 456efc0c20
commit b7bda7031e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
superset/connectors/sqla/models.py
View File

@ -1092,16 +1092,16 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho
columns = groupby or columns
for selected in columns:
# if groupby field/expr equals granularity field/expr
table_col = columns_by_name.get(selected)
if table_col and table_col.type_generic == GenericDataType.TEMPORAL:
outer = table_col.get_timestamp_expression(
if selected == granularity:
sqla_col = columns_by_name[selected]
outer = sqla_col.get_timestamp_expression(
time_grain=time_grain,
label=selected,
template_processor=template_processor,
)
# if groupby field equals a selected column
elif table_col:
outer = table_col.get_sqla_col()
elif selected in columns_by_name:
outer = columns_by_name[selected].get_sqla_col()
else:
outer = literal_column(f"({selected})")
outer = self.make_sqla_column_compatible(outer, selected)