Ticket #13017: sql_query.patch

query.py

@@ -1273 +1273 @@
                                 to_col1, table2, from_col2, to_col2, opts,
                                 target)
 
-                    int_alias = self.join((alias, table1, from_col1, to_col1),
+                    if alias == table1 and from_col1 == to_col1:
+                        alias = self.join((alias, table2, from_col2, to_col2),
                             dupe_multis, exclusions, nullable=True,
                             reuse=can_reuse)
-                    alias = self.join((int_alias, table2, from_col2, to_col2),
+                        joins.extend([alias])
+                    else:
+                        int_alias = self.join((alias, table1, from_col1, to_col1),
                             dupe_multis, exclusions, nullable=True,
                             reuse=can_reuse)
-                    joins.extend([int_alias, alias])
+                        alias = self.join((int_alias, table2, from_col2, to_col2),
+                            dupe_multis, exclusions, nullable=True,
+                            reuse=can_reuse)
+                        joins.extend([int_alias, alias])
                 else:
                     # One-to-many field (ForeignKey defined on the target model)
                     if cached_data: