Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions datasette/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,16 @@ def human_clause(self, column, value):
raise NotImplementedError


def _coerce_numeric_filter_value(value):
try:
return int(value)
except ValueError:
try:
return float(value)
except ValueError:
return value


class TemplatedFilter(Filter):
def __init__(
self,
Expand All @@ -206,8 +216,8 @@ def __init__(

def where_clause(self, table, column, value, param_counter):
converted = self.format.format(value)
if self.numeric and converted.isdigit():
converted = int(converted)
if self.numeric:
converted = _coerce_numeric_filter_value(converted)
if self.no_argument:
kwargs = {"c": _quote_sqlite_identifier(column)}
converted = None
Expand Down
21 changes: 21 additions & 0 deletions tests/test_numeric_filter_values.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import pytest

from datasette.filters import Filters


@pytest.mark.parametrize(
"value,expected",
(
("3.5", 3.5),
("-2", -2),
("-2.5", -2.5),
("1e3", 1000.0),
("not-a-number", "not-a-number"),
),
)
def test_numeric_filter_parameters(value, expected):
filters = Filters((("score__gt", value),))
sql_bits, params = filters.build_where_clauses("items")

assert sql_bits == ['"score" > :p0']
assert params == {"p0": expected}