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

Re-display user's query with an error message if an error occurs (#1346)

Browse source 
* Ignore _shape when returning errors
This commit is contained in:
Simon Willison 2021-06-01 23:46:20 -04:00 • committed by GitHub
commit 9552414e1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
datasette/views/base.py
View file

@ -294,6 +294,8 @@ class DataView(BaseView):
)
if isinstance(response_or_template_contexts, Response):
return response_or_template_contexts
elif len(response_or_template_contexts) == 4:
data, _, _, _ = response_or_template_contexts
else:
data, _, _ = response_or_template_contexts
except (sqlite3.OperationalError, InvalidSql) as e:
@ -467,7 +469,7 @@ class DataView(BaseView):
extra_template_data = {}
start = time.perf_counter()
status_code = 200
status_code = None
templates = []
try:
response_or_template_contexts = await self.data(
@ -475,7 +477,14 @@ class DataView(BaseView):
)
if isinstance(response_or_template_contexts, Response):
return response_or_template_contexts
# If it has four items, it includes an HTTP status code
if len(response_or_template_contexts) == 4:
(
data,
extra_template_data,
templates,
status_code,
) = response_or_template_contexts
else:
data, extra_template_data, templates = response_or_template_contexts
except QueryInterrupted:
@ -542,12 +551,15 @@ class DataView(BaseView):
if isinstance(result, dict):
r = Response(
body=result.get("body"),
status=result.get("status_code", 200),
status=result.get("status_code", status_code or 200),
content_type=result.get("content_type", "text/plain"),
headers=result.get("headers"),
)
elif isinstance(result, Response):
r = result
if status_code is not None:
# Over-ride the status code
r.status = status_code
else:
assert False, f"{result} should be dict or Response"
else:
@ -607,7 +619,8 @@ class DataView(BaseView):
if "metadata" not in context:
context["metadata"] = self.ds.metadata
r = await self.render(templates, request=request, context=context)
r.status = status_code
if status_code is not None:
r.status = status_code
ttl = request.args.get("_ttl", None)
if ttl is None or not ttl.isdigit():