Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Make Jinja template applied in timestamp columns #17237

Merged
merged 3 commits into from
Oct 28, 2021
Merged

feat: Make Jinja template applied in timestamp columns #17237

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53efb6b
Update models.py
xingyc15 Oct 26, 2021
f838d2b
Add optional template processor to get_timestamp_expression()
xingyc15 Oct 27, 2021
f0aec1a
Update models.py
xingyc15 Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,9 @@ def get_timestamp_expression(
sqla_col = column(self.column_name, type_=type_)
return self.table.make_sqla_column_compatible(sqla_col, label)
if self.expression:
col = literal_column(self.expression, type_=type_)
tp = self.table.get_template_processor()
expression = tp.process_template(self.expression)
col = literal_column(expression, type_=type_)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make sure the template processor has access to all query parameters which are defined early in the get_sqla_query method (see

superset/superset/connectors/sqla/models.py

Lines 970 to 982 in 4316fe6

template_kwargs = {
"columns": columns,
"from_dttm": from_dttm.isoformat() if from_dttm else None,
"groupby": groupby,
"metrics": metrics,
"row_limit": row_limit,
"row_offset": row_offset,
"time_column": granularity,
"time_grain": time_grain,
"to_dttm": to_dttm.isoformat() if to_dttm else None,
"table_columns": [col.column_name for col in self.columns],
"filter": filter,
}
), it would be nice to pass the template processor (declared here:

superset/superset/connectors/sqla/models.py

Line 995 in 4316fe6

template_processor = self.get_template_processor(**template_kwargs)
) as an optional parameter to get_timesstamp_expression that can then be used if available.

else:
col = column(self.column_name, type_=type_)
time_expr = self.db_engine_spec.get_timestamp_expr(
Expand Down