Ticket #6899: nonzero-queryset-2.diff

django/db/models/query.py

@@ -72 +72 @@
                 iter(self).next()
             except StopIteration:
                 return False
-        return True
+            else:
+                return True
+        return bool(self._result_cache)
 
     def __getitem__(self, k):
         "Retrieve an item or slice from the set of results."

tests/modeltests/nonzero/models.py

@@ +1 @@
+"""
+43. Boolean evaluation of QuerySets
+
+This tests that QuerySet.__nonzero__ behaves consistently between caching.
+"""
+
+from django.db import models
+
+class Empty(models.Model):
+    pass
+
+__test__ = {'API_TESTS':"""
+>>> objects = Empty.objects.all()
+>>> bool(objects)
+False
+>>> bool(objects)
+False
+>>> Empty().save()
+>>> bool(Empty.objects.filter(pk=1).extra(select={'a':1}).values('a'))
+True
+"""}