Skip to content

fix(dashboard): filter numeric values correctly #33230

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

fix(dashboard): filter numeric values correctly #33230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d11e04b
Fixes ##33206
suraj-mandal Apr 24, 2025
b7940bb
Merge pull request #1 from suraj-mandal/feature/suraj
suraj-mandal Apr 24, 2025
7ec5eae
Improved code quality.
suraj-mandal Apr 24, 2025
3e65daa
Added fix for `ExplorerMixin` class present in superset/models.
suraj-mandal Apr 24, 2025
fe732b4
Made changes as per AI Bot
suraj-mandal Apr 24, 2025
2300340
Fixed test for sqla_models integration tests
suraj-mandal Apr 24, 2025
77f965a
Fixed test for sqlite, postgres and mysql databases.
suraj-mandal Apr 29, 2025
7627303
Changed logging status.
suraj-mandal Apr 29, 2025
5fc98ff
Merge branch 'apache:master' into master
suraj-mandal May 5, 2025
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
11 changes: 11 additions & 0 deletions superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,13 @@ def filter_values_handler( # pylint: disable=too-many-arguments # noqa: C901
def handle_single_value(value: FilterValue | None) -> FilterValue | None:
if operator == utils.FilterOperator.TEMPORAL_RANGE:
return value

if (
isinstance(value, (float, int))
and target_generic_type == utils.GenericDataType.NUMERIC
):
value = float(value)

if (
isinstance(value, (float, int))
and target_generic_type == utils.GenericDataType.TEMPORAL
Expand All @@ -548,6 +555,10 @@ def handle_single_value(value: FilterValue | None) -> FilterValue | None:
):
# For backwards compatibility and edge cases
# where a column data type might have changed
try:
value = float(value)
except ValueError:
logger.warning(f"Unable to convert {value} to float")
return utils.cast_to_num(value)
if value == NULL_STRING:
return None
Expand Down
10 changes: 10 additions & 0 deletions superset/models/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,12 @@ def filter_values_handler( # pylint: disable=too-many-arguments # noqa: C901
def handle_single_value(value: Optional[FilterValue]) -> Optional[FilterValue]:
if operator == utils.FilterOperator.TEMPORAL_RANGE:
return value

if (
isinstance(value, (float, int))
and target_generic_type == utils.GenericDataType.NUMERIC
):
value = float(value)
if (
isinstance(value, (float, int))
and target_generic_type == utils.GenericDataType.TEMPORAL
Expand All @@ -1187,6 +1193,10 @@ def handle_single_value(value: Optional[FilterValue]) -> Optional[FilterValue]:
):
# For backwards compatibility and edge cases
# where a column data type might have changed
try:
value = float(value)
except ValueError:
logger.warning(f"Unable to convert {value} to number")
return utils.cast_to_num(value)
if value == NULL_STRING:
return None
Expand Down
6 changes: 4 additions & 2 deletions tests/integration_tests/sqla_models_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,10 @@ def test_where_operators(self):
FilterTestCase("num", FilterOperator.LESS_THAN_OR_EQUALS, 0, "<= 0"),
FilterTestCase("num", FilterOperator.EQUALS, 0, "= 0"),
FilterTestCase("num", FilterOperator.NOT_EQUALS, 0, "!= 0"),
FilterTestCase("num", FilterOperator.IN, ["1", "2"], "IN (1, 2)"),
FilterTestCase("num", FilterOperator.NOT_IN, ["1", "2"], "NOT IN (1, 2)"),
FilterTestCase("num", FilterOperator.IN, ["1", "2"], "IN (1.0, 2.0)"),
FilterTestCase(
"num", FilterOperator.NOT_IN, ["1", "2"], "NOT IN (1.0, 2.0)"
),
FilterTestCase(
"ds", FilterOperator.TEMPORAL_RANGE, "2020 : 2021", "2020-01-01"
),
Expand Down