Skip to content

Escape identifiers in arraycontains/arraynotcontains filters (refs #2431) #2853

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
winklemad wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −5
Open

Escape identifiers in arraycontains/arraynotcontains filters (refs #2431) #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions datasette/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,16 @@ def where_clause(self, table, column, value, param_counter):
kwargs = {"c": column}
converted = None
else:
kwargs = {"c": column, "p": f"p{param_counter}", "t": table}
kwargs = {
"c": column,
"p": f"p{param_counter}",
"t": table,
# Properly quoted identifiers for templates that reference the
# table/column directly (e.g. json_each()). Bracket quoting
# cannot escape a "]" in a name, so use escape_sqlite() instead.
"c_escaped": escape_sqlite(column),
"t_escaped": escape_sqlite(table) if table is not None else "",
}
return self.sql_template.format(**kwargs), converted

def human_clause(self, column, value):
Expand Down Expand Up @@ -322,13 +331,13 @@ class Filters:
TemplatedFilter(
"arraycontains",
"array contains",
""":{p} in (select value from json_each([{t}].[{c}]))""",
""":{p} in (select value from json_each({t_escaped}.{c_escaped}))""",
'{c} contains "{v}"',
),
TemplatedFilter(
"arraynotcontains",
"array does not contain",
""":{p} not in (select value from json_each([{t}].[{c}]))""",
""":{p} not in (select value from json_each({t_escaped}.{c_escaped}))""",
'{c} does not contain "{v}"',
),
]
Expand Down
16 changes: 14 additions & 2 deletions tests/test_filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,24 @@
# JSON arraycontains, arraynotcontains
(
(("Availability+Info__arraycontains", "yes"),),
[":p0 in (select value from json_each([table].[Availability+Info]))"],
[':p0 in (select value from json_each("table"."Availability+Info"))'],
["yes"],
),
(
(("Availability+Info__arraynotcontains", "yes"),),
[":p0 not in (select value from json_each([table].[Availability+Info]))"],
[':p0 not in (select value from json_each("table"."Availability+Info"))'],
["yes"],
),
# A column name containing "]" must be escaped with escape_sqlite() -
# bracket quoting would produce invalid SQL, see refs #2431
(
(("ta]gs__arraycontains", "yes"),),
[':p0 in (select value from json_each("table"."ta]gs"))'],
["yes"],
),
(
(("ta]gs__arraynotcontains", "yes"),),
[':p0 not in (select value from json_each("table"."ta]gs"))'],
["yes"],
),
],
Expand Down