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

New ?_shape=array option + tweaks to _shape, closes #245

Browse source 
* Default is now ?_shape=arrays (renamed from lists)
* New ?_shape=array returns an array of objects as the root object
* Changed ?_shape=object to return the object as the root
* Updated docs
This commit is contained in:
Simon Willison 2018-05-01 17:08:16 -07:00 • committed by Simon Willison
commit a4cc5dc813
3 changed files with 74 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
datasette/app.py
View file

@ -253,7 +253,7 @@ class BaseView(RenderMixin):
forward_querystring=False
)
# Deal with the _shape option
shape = request.args.get('_shape', 'lists')
shape = request.args.get('_shape', 'arrays')
if shape in ('objects', 'object', 'array'):
columns = data.get('columns')
rows = data.get('rows')
@ -275,7 +275,7 @@ class BaseView(RenderMixin):
for row in data['rows']:
pk_string = path_from_row_pks(row, pks, not pks)
object_rows[pk_string] = row
data['rows'] = object_rows
data = object_rows
if error:
data = {
'ok': False,
@ -283,9 +283,18 @@ class BaseView(RenderMixin):
'database': name,
'database_hash': hash,
}
if shape == 'array':
elif shape == 'array':
data = data['rows']
elif shape == 'arrays':
pass
else:
status_code = 400
data = {
'ok': False,
'error': 'Invalid _shape: {}'.format(shape),
'status': 400,
'title': None,
}
headers = {}
if self.ds.cors:
headers['Access-Control-Allow-Origin'] = '*'