Skip to content

fix(chart): Supporting custom SQL as temporal x-axis column with filter #25126

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

Merged
eschutho merged 14 commits into from
Sep 18, 2023
Merged

fix(chart): Supporting custom SQL as temporal x-axis column with filter #25126

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b62640
fix: dealing with case where x_axis is dict when column is custom_sql…
Aug 30, 2023
8bc5c72
renaming vars
Sep 6, 2023
a191583
lint
Sep 6, 2023
cf8c0ba
added api_tests
Sep 6, 2023
f65d707
Update control only if control exists in current viz type
kgabryje Sep 11, 2023
08a50ce
skip test for now
Sep 11, 2023
a76ed47
Merge remote-tracking branch 'origin/zef/fix_x_axis_custom_sql' into …
Sep 11, 2023
d16ffbb
Update tests
kgabryje Sep 14, 2023
16f941d
fixing test
Sep 14, 2023
91788c1
Merge remote-tracking branch 'origin/zef/fix_x_axis_custom_sql' into …
Sep 14, 2023
bb52a1a
Merge remote-tracking branch 'origin/master' into zef/fix_x_axis_cust…
Sep 14, 2023
5c79619
using is_adhoc_column to determine x_axis
Sep 15, 2023
64e01b6
addressing comments and fixed a small issue where custom sql can be e…
Sep 15, 2023
672eea4
fixed tests
Sep 15, 2023
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
16 changes: 12 additions & 4 deletions superset/common/query_context_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ def _apply_granularity(

if granularity := query_object.granularity:
filter_to_remove = None
if x_axis and x_axis in temporal_columns:
x_axis_column_name = (
x_axis["sqlExpression"] if isinstance(x_axis, dict) else x_axis
)
Comment thread
zephyring marked this conversation as resolved.
Outdated
if x_axis_column_name in temporal_columns:
filter_to_remove = x_axis
x_axis_column = next(
(
Expand All @@ -137,7 +140,7 @@ def _apply_granularity(
if column == x_axis
or (
isinstance(column, dict)
and column["sqlExpression"] == x_axis
and column["sqlExpression"] == x_axis_column_name
)
),
None,
Expand Down Expand Up @@ -175,11 +178,16 @@ def _apply_granularity(
# another temporal filter. A new filter based on the value of
# the granularity will be added later in the code.
# In practice, this is replacing the previous default temporal filter.
if filter_to_remove:
filter_to_remove_str = (
filter_to_remove["sqlExpression"]
if isinstance(filter_to_remove, dict)
else filter_to_remove
)
if filter_to_remove_str:
query_object.filter = [
filter
for filter in query_object.filter
if filter["col"] != filter_to_remove
if filter["col"] != filter_to_remove_str
]

def _apply_filters(self, query_object: QueryObject) -> None:
Expand Down