1
0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00

Fixed #29530 -- Fixed aliases ordering when chaining annotate() and filter().

This commit is contained in:
Mariusz Felisiak 2018-07-02 21:09:29 +02:00 committed by GitHub
parent b49b59b029
commit 0e64e046a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View File

@ -934,8 +934,14 @@ class Query:
if (reuse is None or a in reuse) and j == join if (reuse is None or a in reuse) and j == join
] ]
if reuse_aliases: if reuse_aliases:
self.ref_alias(reuse_aliases[0]) if join.table_alias in reuse_aliases:
return reuse_aliases[0] reuse_alias = join.table_alias
else:
# Reuse the most recent alias of the joined table
# (a many-to-many relation may be joined multiple times).
reuse_alias = reuse_aliases[-1]
self.ref_alias(reuse_alias)
return reuse_alias
# No reuse is possible, so we need a new alias. # No reuse is possible, so we need a new alias.
alias, _ = self.table_alias(join.table_name, create=True, filtered_relation=join.filtered_relation) alias, _ = self.table_alias(join.table_name, create=True, filtered_relation=join.filtered_relation)

View File

@ -569,3 +569,19 @@ class NonAggregateAnnotationTestCase(TestCase):
Book.objects.annotate(is_book=True) Book.objects.annotate(is_book=True)
with self.assertRaisesMessage(TypeError, msg % ', '.join([str(BooleanField()), 'True'])): with self.assertRaisesMessage(TypeError, msg % ', '.join([str(BooleanField()), 'True'])):
Book.objects.annotate(BooleanField(), Value(False), is_book=True) Book.objects.annotate(BooleanField(), Value(False), is_book=True)
def test_chaining_annotation_filter_with_m2m(self):
qs = Author.objects.filter(
name='Adrian Holovaty',
friends__age=35,
).annotate(
jacob_name=F('friends__name'),
).filter(
friends__age=29,
).annotate(
james_name=F('friends__name'),
).values('jacob_name', 'james_name')
self.assertCountEqual(
qs,
[{'jacob_name': 'Jacob Kaplan-Moss', 'james_name': 'James Bennett'}],
)