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

Fix for bug running ?sql= against databases with a different route, closes #1682

Browse source
This commit is contained in:
Simon Willison 2022-03-23 11:48:10 -07:00
commit 0159662ab8
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
datasette/views/database.py
View file

@ -203,7 +203,12 @@ class QueryView(DataView):
named_parameters=None, named_parameters=None,
write=False, write=False,
): ):
database = tilde_decode(request.url_vars["database"]) database_route = tilde_decode(request.url_vars["database"])
try:
db = self.ds.get_database(route=database_route)
except KeyError:
raise NotFound("Database not found: {}".format(database_route))
database = db.name
params = {key: request.args.get(key) for key in request.args} params = {key: request.args.get(key) for key in request.args}
if "sql" in params: if "sql" in params:
params.pop("sql") params.pop("sql")

1
tests/test_routes.py
View file

@ -94,6 +94,7 @@ async def test_db_with_route_databases(ds_with_route):
("/original-name/t", 404), ("/original-name/t", 404),
("/original-name/t/1", 404), ("/original-name/t/1", 404),
("/custom-route-name", 200), ("/custom-route-name", 200),
("/custom-route-name?sql=select+id+from+t", 200),
("/custom-route-name/t", 200), ("/custom-route-name/t", 200),
("/custom-route-name/t/1", 200), ("/custom-route-name/t/1", 200),
), ),