iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bufix] superset views not getting from_dttm-to_dttm in template context (#2978)

This commit is contained in:
Maxime Beauchemin 2017-06-15 22:49:55 -07:00 committed by GitHub
parent 712297480c
commit 89cd10b3ce
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

@ -337,13 +337,13 @@ class SqlaTable(Model, BaseDatasource):
tbl.schema = self.schema
return tbl
def get_from_clause(self):
def get_from_clause(self, template_processor=None):
# Supporting arbitrary SQL statements in place of tables
if self.sql:
tp = self.get_template_processor()
from_sql = tp.process_template(self.sql)
from_sql = self.sql
if template_processor:
from_sql = template_processor.process_template(from_sql)
return TextAsFrom(sa.text(from_sql), []).alias('expr_qry')
return self.get_sqla_table()
def get_sqla_query( # sqla
@ -444,7 +444,7 @@ class SqlaTable(Model, BaseDatasource):
select_exprs += metrics_exprs
qry = sa.select(select_exprs)
tbl = self.get_from_clause()
tbl = self.get_from_clause(template_processor)
if not columns:
qry = qry.group_by(*groupby_exprs)