pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:hmarr/mongoengine into dev

Browse Source
This commit is contained in:
Harry Marr 2010-11-02 13:44:19 +00:00
commit c6058fafed
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mongoengine/queryset.py
View File

@ -431,7 +431,9 @@ class QuerySet(object):
self._cursor_obj.where(self._where_clause) self._cursor_obj.where(self._where_clause)
# apply default ordering # apply default ordering
if self._document._meta['ordering']: if self._ordering:
self._cursor_obj.sort(self._ordering)
elif self._document._meta['ordering']:
self.order_by(*self._document._meta['ordering']) self.order_by(*self._document._meta['ordering'])
if self._limit is not None: if self._limit is not None:

18
tests/queryset.py
View File

@ -1440,6 +1440,24 @@ class QuerySetTest(unittest.TestCase):
Post.drop_collection() Post.drop_collection()
def test_order_then_filter(self):
"""Ensure that ordering still works after filtering.
"""
class Number(Document):
n = IntField()
Number.drop_collection()
n2 = Number.objects.create(n=2)
n1 = Number.objects.create(n=1)
self.assertEqual(list(Number.objects), [n2, n1])
self.assertEqual(list(Number.objects.order_by('n')), [n1, n2])
self.assertEqual(list(Number.objects.order_by('n').filter()), [n1, n2])
Number.drop_collection()
class QTest(unittest.TestCase): class QTest(unittest.TestCase):
def test_empty_q(self): def test_empty_q(self):