diff options
| -rw-r--r-- | django/db/models/sql/query.py | 1 | ||||
| -rw-r--r-- | tests/filtered_relation/tests.py | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 92a09c5840..187349a460 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1723,6 +1723,7 @@ class Query(BaseExpression): "relations deeper than the relation_name (got %r for " "%r)." % (lookup, filtered_relation.relation_name) ) + filtered_relation = filtered_relation.clone() filtered_relation.condition = rename_prefix_from_q( filtered_relation.relation_name, alias, diff --git a/tests/filtered_relation/tests.py b/tests/filtered_relation/tests.py index a9c6e00567..cdcd5c19af 100644 --- a/tests/filtered_relation/tests.py +++ b/tests/filtered_relation/tests.py @@ -604,6 +604,28 @@ class FilteredRelationTests(TestCase): qs.filter(my_readers=borrower).values_list("name", flat=True), ["Alice"] ) + def test_reuse_same_filtered_relation(self): + borrower = Borrower.objects.create(name="Jenny") + Reservation.objects.create( + borrower=borrower, + book=self.book1, + state=Reservation.STOPPED, + ) + condition = Q(book__reservation__state=Reservation.STOPPED) + my_reserved_books = FilteredRelation("book__reservation", condition=condition) + first_query = list( + Author.objects.annotate( + my_reserved_books=my_reserved_books, + ) + ) + self.assertEqual(my_reserved_books.condition, condition) + second_query = list( + Author.objects.annotate( + my_reserved_books=my_reserved_books, + ) + ) + self.assertEqual(first_query, second_query) + def test_deep_nested_foreign_key(self): qs = ( Book.objects.annotate( |