github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

SQL view-friendly arraycontains/arraynotcontains implementation, refs #448

Browse source
This commit is contained in:
Simon Willison 2021-11-15 15:41:07 -08:00
commit 07044bd130
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
datasette/filters.py
View file

@ -149,19 +149,13 @@ class Filters:
TemplatedFilter( TemplatedFilter(
"arraycontains", "arraycontains",
"array contains", "array contains",
"""rowid in ( """:{p} in (select value from json_each([{t}].[{c}]))""",
select {t}.rowid from {t}, json_each([{t}].[{c}]) j
where j.value = :{p}
)""",
'{c} contains "{v}"', '{c} contains "{v}"',
), ),
TemplatedFilter( TemplatedFilter(
"arraynotcontains", "arraynotcontains",
"array does not contain", "array does not contain",
"""rowid not in ( """:{p} not in (select value from json_each([{t}].[{c}]))""",
select {t}.rowid from {t}, json_each([{t}].[{c}]) j
where j.value = :{p}
)""",
'{c} does not contain "{v}"', '{c} does not contain "{v}"',
), ),
] ]

11
tests/test_filters.py
View file

@ -56,12 +56,15 @@ import pytest
# Not in, and JSON array not in # Not in, and JSON array not in
((("foo__notin", "1,2,3"),), ["foo not in (:p0, :p1, :p2)"], ["1", "2", "3"]), ((("foo__notin", "1,2,3"),), ["foo not in (:p0, :p1, :p2)"], ["1", "2", "3"]),
((("foo__notin", "[1,2,3]"),), ["foo not in (:p0, :p1, :p2)"], [1, 2, 3]), ((("foo__notin", "[1,2,3]"),), ["foo not in (:p0, :p1, :p2)"], [1, 2, 3]),
# JSON arraycontains # JSON arraycontains, arraynotcontains
( (
(("Availability+Info__arraycontains", "yes"),), (("Availability+Info__arraycontains", "yes"),),
[ [":p0 in (select value from json_each([table].[Availability+Info]))"],
"rowid in (\n select table.rowid from table, json_each([table].[Availability+Info]) j\n where j.value = :p0\n )" ["yes"],
], ),
(
(("Availability+Info__arraynotcontains", "yes"),),
[":p0 not in (select value from json_each([table].[Availability+Info]))"],
["yes"], ["yes"],
), ),
], ],