Ticket #20535: #20353-Unnecessary_join created for intermediate_table_between_two_M2M_tables.diff

django/db/models/fields/related.py

@@ -884 +884 @@
     def set_field_name(self):
         self.field_name = self.field_name or self.to._meta.pk.name
 
+    @property
+    def related_fields(self):
+        return [tuple([self.get_related_field(), self.field])]
+
+    @property
+    def foreign_related_fields(self):
+        return tuple([self.field])
+
 
 class OneToOneRel(ManyToOneRel):
     def __init__(self, field, to, field_name, related_name=None, limit_choices_to=None,

django/db/models/sql/query.py

@@ -1356 +1356 @@
         # Then, add the path to the query's joins. Note that we can't trim
         # joins at this stage - we will need the information about join type
         # of the trimmed joins.
+        last = None
+        final_path = []
         for pos, join in enumerate(path):
-            opts = join.to_opts
+            if pos < len(path) - 1:
+                next = path[pos + 1]
+            else:
+                next = None
             if join.direct:
                 nullable = self.is_nullable(join.join_field)
             else:
                 nullable = True
-            connection = alias, opts.db_table, join.join_field.get_joining_columns()
+            final_path.append(join)
+            joining_columns = join.join_field.get_joining_columns()
+            if last and next:
+                # Try removing previous join if the current one maps directly
+                # to the next one (much in the way trim_joins does it):
+                cur_targets = set(t.column for t in zip(*join.join_field.related_fields)[0])
+                join_targets = set(t.column for t in next.join_field.foreign_related_fields)
+                if cur_targets.issubset(join_targets):
+                    self.unref_alias(joins.pop())
+                    alias = joins[-1]
+                    final_path.pop()
+                    from_join = joining_columns[0][1]
+                    to_join = next.join_field.get_joining_columns()[0][0]
+                    joining_columns = ((from_join, to_join),)
+            last = join
+            opts = join.to_opts
+            connection = alias, opts.db_table, joining_columns
             reuse = can_reuse if join.m2m else None
             alias = self.join(connection, reuse=reuse,
                               nullable=nullable, join_field=join.join_field)
             joins.append(alias)
         if hasattr(final_field, 'field'):
             final_field = final_field.field
-        return final_field, targets, opts, joins, path
+        return final_field, targets, opts, joins, final_path
 
     def trim_joins(self, targets, joins, path):
         """

tests/m2m_through/tests.py

@@ -343 +343 @@
             ],
             attrgetter("name")
         )
+
+    def test_ticket_20535_join_trimming(self):
+        qs = Friendship.objects.filter(first__rel_to_set__first__id=1)
+        self.assertEqual(str(qs.query).count('JOIN'), 1)
+
+    def test_ticket_20535_no_join_trimming(self):
+        qs = Friendship.objects.filter(first__rel_to_set__first__id=1, first__name='Jane')
+        self.assertEqual(str(qs.query).count('JOIN'), 2)