kopia lustrzana https://github.com/simonw/datasette
Add primary keys back to order by clause for sorting, refs #216
rodzic
59a3aa859c
commit
db23da7ae1
|
@ -619,9 +619,11 @@ class TableView(RowTableShared):
|
||||||
if use_rowid:
|
if use_rowid:
|
||||||
select = 'rowid, *'
|
select = 'rowid, *'
|
||||||
order_by = 'rowid'
|
order_by = 'rowid'
|
||||||
|
order_by_pks = 'rowid'
|
||||||
else:
|
else:
|
||||||
select = '*'
|
select = '*'
|
||||||
order_by = ', '.join(pks)
|
order_by_pks = ', '.join([escape_sqlite(pk) for pk in pks])
|
||||||
|
order_by = order_by_pks
|
||||||
|
|
||||||
if is_view:
|
if is_view:
|
||||||
order_by = ''
|
order_by = ''
|
||||||
|
@ -792,6 +794,9 @@ class TableView(RowTableShared):
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
params['p{}'.format(len(params))] = sort_value
|
params['p{}'.format(len(params))] = sort_value
|
||||||
|
order_by = '{}, {}'.format(
|
||||||
|
order_by, order_by_pks
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
where_clauses.extend(next_by_pk_clauses)
|
where_clauses.extend(next_by_pk_clauses)
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue