summaryrefslogtreecommitdiff
path: root/django/db/models/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/query.py')
-rw-r--r--django/db/models/query.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 2f9f9e24ec..563b902bb5 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -651,6 +651,10 @@ class QuerySet(object):
obj = self.values("pk")
return obj.query.as_nested_sql()
+ # When used as part of a nested query, a queryset will never be an "always
+ # empty" result.
+ value_annotation = True
+
class ValuesQuerySet(QuerySet):
def __init__(self, *args, **kwargs):
super(ValuesQuerySet, self).__init__(*args, **kwargs)
@@ -795,6 +799,10 @@ class EmptyQuerySet(QuerySet):
# (it raises StopIteration immediately).
yield iter([]).next()
+ # EmptyQuerySet is always an empty result in where-clauses (and similar
+ # situations).
+ value_annotation = False
+
def get_cached_row(klass, row, index_start, max_depth=0, cur_depth=0,
requested=None):