Merge branch 'master' of http://github.com/benmur/mongoengine into dev

This commit is contained in:
Harry Marr 2010-10-20 13:31:47 +01:00
commit e868f37c60
2 changed files with 23 additions and 0 deletions

View File

@ -434,6 +434,12 @@ class QuerySet(object):
if self._document._meta['ordering']: if self._document._meta['ordering']:
self.order_by(*self._document._meta['ordering']) self.order_by(*self._document._meta['ordering'])
if self._limit is not None:
self._cursor_obj.limit(self._limit)
if self._skip is not None:
self._cursor_obj.skip(self._skip)
return self._cursor_obj return self._cursor_obj
@classmethod @classmethod

View File

@ -1377,6 +1377,23 @@ class QuerySetTest(unittest.TestCase):
Post.drop_collection() Post.drop_collection()
def test_call_after_limits_set(self):
"""Ensure that re-filtering after slicing works
"""
class Post(Document):
title = StringField()
Post.drop_collection()
post1 = Post(title="Post 1")
post1.save()
post2 = Post(title="Post 2")
post2.save()
posts = Post.objects.all()[0:1]
self.assertEqual(len(list(posts())), 1)
Post.drop_collection()
class QTest(unittest.TestCase): class QTest(unittest.TestCase):