mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #28553 -- Fixed annotation mismatch with QuerySet.values()/values_list() on compound queries.

Browse Source 
Co-authored-by: Matthias Kestenholz <mk@feinheit.ch>
This commit is contained in:
David Wobrock
2023-03-13 15:03:28 +01:00
committed by Mariusz Felisiak
parent 39d1e45227
commit d6b6e5d0fd
4 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
django/db/models/sql/query.py
View File

@@ -1087,7 +1087,12 @@ class Query(BaseExpression):
if select:
self.append_annotation_mask([alias])
else:
self.set_annotation_mask(set(self.annotation_select).difference({alias}))
annotation_mask = (
value
for value in dict.fromkeys(self.annotation_select)
if value != alias
)
self.set_annotation_mask(annotation_mask)
self.annotations[alias] = annotation
def resolve_expression(self, query, *args, **kwargs):
@@ -2341,12 +2346,12 @@ class Query(BaseExpression):
if names is None:
self.annotation_select_mask = None
else:
self.annotation_select_mask = set(names)
self.annotation_select_mask = list(dict.fromkeys(names))
self._annotation_select_cache = None
def append_annotation_mask(self, names):
if self.annotation_select_mask is not None:
self.set_annotation_mask(self.annotation_select_mask.union(names))
self.set_annotation_mask((*self.annotation_select_mask, *names))
def set_extra_mask(self, names):
"""
@@ -2423,9 +2428,9 @@ class Query(BaseExpression):
return {}
elif self.annotation_select_mask is not None:
self._annotation_select_cache = {
k: v
for k, v in self.annotations.items()
if k in self.annotation_select_mask
k: self.annotations[k]
for k in self.annotation_select_mask
if k in self.annotations
}
return self._annotation_select_cache
else: