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

derive_named_parameters falls back to regex on SQL error, refs #1421

Browse source
This commit is contained in:
Simon Willison 2021-08-08 20:26:08 -07:00
commit b1fed48a95
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
datasette/utils/__init__.py
View file

@ -1080,11 +1080,12 @@ class StartupError(Exception):
_re_named_parameter = re.compile(":([a-zA-Z0-9_]+)") _re_named_parameter = re.compile(":([a-zA-Z0-9_]+)")
async def derive_named_parameters(db, sql): async def derive_named_parameters(db, sql):
explain = 'explain {}'.format(sql.strip().rstrip(";")) explain = "explain {}".format(sql.strip().rstrip(";"))
possible_params = _re_named_parameter.findall(sql) possible_params = _re_named_parameter.findall(sql)
try: try:
results = await db.execute(explain, {p: None for p in possible_params}) results = await db.execute(explain, {p: None for p in possible_params})
return [row["p4"].lstrip(":") for row in results if row["opcode"] == "Variable"] return [row["p4"].lstrip(":") for row in results if row["opcode"] == "Variable"]
except sqlite3.DatabaseError: except sqlite3.DatabaseError:
return [] return possible_params

9
tests/test_utils.py
View file

@ -629,13 +629,16 @@ def test_parse_metadata(content, expected):
@pytest.mark.asyncio @pytest.mark.asyncio
@pytest.mark.parametrize("sql,expected", ( @pytest.mark.parametrize(
"sql,expected",
(
("select 1", []), ("select 1", []),
("select 1 + :one", ["one"]), ("select 1 + :one", ["one"]),
("select 1 + :one + :two", ["one", "two"]), ("select 1 + :one + :two", ["one", "two"]),
("select 'bob' || '0:00' || :cat", ["cat"]), ("select 'bob' || '0:00' || :cat", ["cat"]),
("select this is invalid", []), ("select this is invalid :one, :two, :three", ["one", "two", "three"]),
)) ),
)
async def test_derive_named_parameters(sql, expected): async def test_derive_named_parameters(sql, expected):
ds = Datasette([], memory=True) ds = Datasette([], memory=True)
db = ds.get_database("_memory") db = ds.get_database("_memory")