QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-18 23:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove BASE_AXIS from pre-query (#29084)

Browse Source
This commit is contained in:
John Bodley
2024-06-05 10:27:26 -07:00
committed by GitHub
parent df0b1cb8ed
commit 17d7e7e5e1
6 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
superset/common/query_context_processor.py
View File

@@ -60,7 +60,7 @@ from superset.utils.core import (
get_column_names_from_columns,
get_column_names_from_metrics,
get_metric_names,
get_xaxis_label,
get_x_axis_label,
normalize_dttm_col,
TIME_COMPARISON,
)
@@ -399,7 +399,7 @@ class QueryContextProcessor:
for offset in query_object.time_offsets:
try:
# pylint: disable=line-too-long
# Since the xaxis is also a column name for the time filter, xaxis_label will be set as granularity
# Since the x-axis is also a column name for the time filter, x_axis_label will be set as granularity
# these query object are equivalent:
# 1) { granularity: 'dttm_col', time_range: '2020 : 2021', time_offsets: ['1 year ago']}
# 2) { columns: [
@@ -414,9 +414,9 @@ class QueryContextProcessor:
)
query_object_clone.to_dttm = get_past_or_future(offset, outer_to_dttm)
xaxis_label = get_xaxis_label(query_object.columns)
x_axis_label = get_x_axis_label(query_object.columns)
query_object_clone.granularity = (
query_object_clone.granularity or xaxis_label
query_object_clone.granularity or x_axis_label
)
except ValueError as ex:
raise QueryObjectValidationError(str(ex)) from ex
@@ -450,7 +450,7 @@ class QueryContextProcessor:
query_object_clone.filter = [
flt
for flt in query_object_clone.filter
if flt.get("col") != xaxis_label
if flt.get("col") != x_axis_label
]
# `offset` is added to the hash function