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

JSON API for writable canned queries, closes #880

Browse source
This commit is contained in:
Simon Willison 2020-09-14 14:23:18 -07:00
commit 72ac2fd32c
4 changed files with 110 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
datasette/utils/testing.py
View file

@ -55,6 +55,7 @@ class TestClient:
redirect_count=0,
content_type="application/x-www-form-urlencoded",
cookies=None,
headers=None,
csrftoken_from=None,
):
cookies = cookies or {}
@ -72,13 +73,14 @@ class TestClient:
if post_data:
body = urlencode(post_data, doseq=True)
return await self._request(
path,
allow_redirects,
redirect_count,
"POST",
cookies,
body,
content_type,
path=path,
allow_redirects=allow_redirects,
redirect_count=redirect_count,
method="POST",
cookies=cookies,
headers=headers,
post_body=body,
content_type=content_type,
)
async def _request(
@ -88,6 +90,7 @@ class TestClient:
redirect_count=0,
method="GET",
cookies=None,
headers=None,
post_body=None,
content_type=None,
):
@ -99,14 +102,17 @@ class TestClient:
raw_path = path.encode("latin-1")
else:
raw_path = quote(path, safe="/:,").encode("latin-1")
headers = [[b"host", b"localhost"]]
asgi_headers = [[b"host", b"localhost"]]
if headers:
for key, value in headers.items():
asgi_headers.append([key.encode("utf-8"), value.encode("utf-8")])
if content_type:
headers.append((b"content-type", content_type.encode("utf-8")))
asgi_headers.append((b"content-type", content_type.encode("utf-8")))
if cookies:
sc = SimpleCookie()
for key, value in cookies.items():
sc[key] = value
headers.append([b"cookie", sc.output(header="").encode("utf-8")])
asgi_headers.append([b"cookie", sc.output(header="").encode("utf-8")])
scope = {
"type": "http",
"http_version": "1.0",
@ -114,7 +120,7 @@ class TestClient:
"path": unquote(path),
"raw_path": raw_path,
"query_string": query_string,
"headers": headers,
"headers": asgi_headers,
}
instance = ApplicationCommunicator(self.asgi_app, scope)

22
datasette/views/database.py
View file

@ -219,10 +219,17 @@ class QueryView(DataView):
params[key] = str(value)
else:
params = dict(parse_qsl(body, keep_blank_values=True))
# Should we return JSON?
should_return_json = (
request.headers.get("accept") == "application/json"
or request.args.get("_json")
or params.get("_json")
)
if canned_query:
params_for_query = MagicParameters(params, request, self.ds)
else:
params_for_query = params
ok = None
try:
cursor = await self.ds.databases[database].execute_write(
sql, params_for_query, block=True
@ -234,12 +241,23 @@ class QueryView(DataView):
)
message_type = self.ds.INFO
redirect_url = metadata.get("on_success_redirect")
ok = True
except Exception as e:
message = metadata.get("on_error_message") or str(e)
message_type = self.ds.ERROR
redirect_url = metadata.get("on_error_redirect")
self.ds.add_message(request, message, message_type)
return self.redirect(request, redirect_url or request.path)
ok = False
if should_return_json:
return Response.json(
{
"ok": ok,
"message": message,
"redirect": redirect_url,
}
)
else:
self.ds.add_message(request, message, message_type)
return self.redirect(request, redirect_url or request.path)
else:
async def extra_template():