Ticket #20535: #20535-tests.diff

django/tests/modeltests/m2m_through/models.py

@@ -16 +16 @@
         return self.name
 
 @python_2_unicode_compatible
+class Relationship(models.Model):
+    from_person = models.ForeignKey(Person, related_name='idols')
+    to_person = models.ForeignKey(Person, related_name='followers')
+
+@python_2_unicode_compatible
 class Group(models.Model):
     name = models.CharField(max_length=128)
     members = models.ManyToManyField(Person, through='Membership')

django/tests/modeltests/m2m_through/tests.py

@@ -5 +5 @@
 
 from django.test import TestCase
 
-from .models import (Person, Group, Membership, CustomMembership,
+from .models import (Relationship, Person, Group, Membership, CustomMembership,
     PersonSelfRefM2M, Friendship)
 
 
@@ -343 +343 @@
             ],
             attrgetter("name")
         )
+
+    def test_ticket_20535_m2m_trim(self):
+        qs = Relationship.objects.filter(from_person__followers__from_person=self.bob)
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_ticket_20535_m2m_no_trim(self):
+        qs = Relationship.objects.filter(from_person__followers__from_person=self.bob, from_person__name='Jane')
+        self.assertEqual(str(qs.query).count('JOIN'), 2)