0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

update to sqlalchemy 1

Browse source
This commit is contained in:
j 2016-02-22 18:00:55 +05:30
commit 649b0553b4
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
oml/item/query.py
View file

@ -24,6 +24,7 @@ def parse(data):
return query
def order(qs, sort, prefix='sort.'):
from sqlalchemy.sql.expression import text
order_by = []
if len(sort) == 1:
additional_sort = settings.config['user']['ui']['listSort']
@ -48,8 +49,8 @@ def order(qs, sort, prefix='sort.'):
_order_by = []
for order in order_by:
nulls = "%s IS NULL" % order.split(' ')[0]
_order_by.append(nulls)
_order_by.append(order)
_order_by.append(text(nulls))
_order_by.append(text(order))
order_by = _order_by
qs = qs.join(models.Sort).order_by(*order_by)
return qs