Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #14366 -- Model.objects.none().values() now correctly r…

…eturns a QuerySet with no items, rather than raising an Exception. Thanks to Carl Meyer for the patch. Backport of [14084].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bb66cb8463190a0d65b920f44f50c23da9f58bd7 1 parent 2e5f0c2
Alex Gaynor alex authored
2  django/db/models/query.py
View
@@ -1021,7 +1021,7 @@ def delete(self):
pass
def _clone(self, klass=None, setup=False, **kwargs):
- c = super(EmptyQuerySet, self)._clone(klass, **kwargs)
+ c = super(EmptyQuerySet, self)._clone(klass, setup=setup, **kwargs)
c._result_cache = []
return c
8 tests/regressiontests/queries/tests.py
View
@@ -4,7 +4,7 @@
from django.db.models import Count
from django.test import TestCase
-from models import Tag, Annotation, DumbCategory, Note, ExtraInfo
+from models import Tag, Annotation, DumbCategory, Note, ExtraInfo, Number
class QuerysetOrderedTests(unittest.TestCase):
"""
@@ -81,3 +81,9 @@ def test_evaluated_queryset_as_argument(self):
self.assertEquals(ExtraInfo.objects.filter(note__in=n_list)[0].info, 'good')
except:
self.fail('Query should be clonable')
+
+
+class EmptyQuerySetTests(TestCase):
+ def test_emptyqueryset_values(self):
+ "#14366 -- calling .values() on an EmptyQuerySet and then cloning that should not cause an error"
+ self.assertEqual(list(Number.objects.none().values('num').order_by('num')), [])
Please sign in to comment.
Something went wrong with that request. Please try again.