mirror of
https://github.com/apache/superset.git
synced 2024-09-17 11:09:47 -04:00
fix: Handle Python date format for GENERIC_CHART_AXES feature (#25135)
This commit is contained in:
parent
06bf44a823
commit
de9515c294
@ -991,11 +991,13 @@ class SqlaTable(
|
|||||||
time_grain = col.get("timeGrain")
|
time_grain = col.get("timeGrain")
|
||||||
has_timegrain = col.get("columnType") == "BASE_AXIS" and time_grain
|
has_timegrain = col.get("columnType") == "BASE_AXIS" and time_grain
|
||||||
is_dttm = False
|
is_dttm = False
|
||||||
|
pdf = None
|
||||||
if col_in_metadata := self.get_column(expression):
|
if col_in_metadata := self.get_column(expression):
|
||||||
sqla_column = col_in_metadata.get_sqla_col(
|
sqla_column = col_in_metadata.get_sqla_col(
|
||||||
template_processor=template_processor
|
template_processor=template_processor
|
||||||
)
|
)
|
||||||
is_dttm = col_in_metadata.is_temporal
|
is_dttm = col_in_metadata.is_temporal
|
||||||
|
pdf = col_in_metadata.python_date_format
|
||||||
else:
|
else:
|
||||||
sqla_column = literal_column(expression)
|
sqla_column = literal_column(expression)
|
||||||
if has_timegrain or force_type_check:
|
if has_timegrain or force_type_check:
|
||||||
@ -1012,7 +1014,7 @@ class SqlaTable(
|
|||||||
if is_dttm and has_timegrain:
|
if is_dttm and has_timegrain:
|
||||||
sqla_column = self.db_engine_spec.get_timestamp_expr(
|
sqla_column = self.db_engine_spec.get_timestamp_expr(
|
||||||
col=sqla_column,
|
col=sqla_column,
|
||||||
pdf=None,
|
pdf=pdf,
|
||||||
time_grain=time_grain,
|
time_grain=time_grain,
|
||||||
)
|
)
|
||||||
return self.make_sqla_column_compatible(sqla_column, label)
|
return self.make_sqla_column_compatible(sqla_column, label)
|
||||||
|
Loading…
Reference in New Issue
Block a user