Merge commit '18baa2dd7a4e909169b694cb6ec36214c5a51506'
This commit is contained in:
		| @@ -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 | ||||||
|   | |||||||
| @@ -1429,6 +1429,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): | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user