diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2010-06-22 18:09:08 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2010-06-22 18:09:08 +0000 |
| commit | d6993c7dbb4ffef939e9061a701be2e442971d3b (patch) | |
| tree | f6977576979d24e98860840242358e66434aa781 | |
| parent | 33523c9f95d47dec1a06ef2515af269e91be19b5 (diff) | |
[soc2010/query-refactor] Fixed Querysets in MongoDB with a limit of 0.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/mongodb/compiler.py | 9 | ||||
| -rw-r--r-- | tests/regressiontests/mongodb/tests.py | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/django/contrib/mongodb/compiler.py b/django/contrib/mongodb/compiler.py index 880f9bc7cd..3a1a14fd14 100644 --- a/django/contrib/mongodb/compiler.py +++ b/django/contrib/mongodb/compiler.py @@ -1,6 +1,6 @@ from pymongo import ASCENDING, DESCENDING -from django.db.models.sql.datastructures import FullResultSet +from django.db.models.sql.datastructures import FullResultSet, EmptyResultSet # TODO: ... @@ -87,11 +87,16 @@ class SQLCompiler(object): if self.query.low_mark: cursor = cursor.skip(self.query.low_mark) if self.query.high_mark is not None: + if self.query.high_mark - self.query.low_mark == 0: + raise EmptyResultSet cursor = cursor.limit(self.query.high_mark - self.query.low_mark) return cursor def results_iter(self): - query = self.build_query() + try: + query = self.build_query() + except EmptyResultSet: + return fields = self.get_fields(aggregates=False) if fields is None: fields = [ diff --git a/tests/regressiontests/mongodb/tests.py b/tests/regressiontests/mongodb/tests.py index 5c58f81171..e977ebeb42 100644 --- a/tests/regressiontests/mongodb/tests.py +++ b/tests/regressiontests/mongodb/tests.py @@ -95,8 +95,7 @@ class MongoTestCase(TestCase): ] for i in xrange(5): - # TODO: should be i, but Mongo falls over with limit(0) - for j in xrange(i+1, 5): + for j in xrange(i, 5): self.assertQuerysetEqual( Artist.objects.all()[i:j], artists[i:j], |