Ticket #11267: queries_by_attr_name_2.patch

django/db/models/sql/query.py

@@ -1678 +1678 @@
             self.used_aliases = used_aliases
 
     def setup_joins(self, names, opts, alias, dupe_multis, allow_many=True,
-            allow_explicit_fk=False, can_reuse=None, negate=False,
-            process_extras=True):
+            can_reuse=None, negate=False, process_extras=True):
         """
         Compute the necessary table joins for the passage through the fields
         given in 'names'. 'opts' is the Options class for the current model
@@ -1715 +1714 @@
                 field, model, direct, m2m = opts.get_field_by_name(name)
             except FieldDoesNotExist:
                 for f in opts.fields:
-                    if allow_explicit_fk and name == f.attname:
-                        # XXX: A hack to allow foo_id to work in values() for
-                        # backwards compatibility purposes. If we dropped that
-                        # feature, this could be removed.
+                    if name == f.attname:
                         field, model, direct, m2m = opts.get_field_by_name(f.name)
                         break
                 else:
@@ -2026 +2022 @@
         try:
             for name in field_names:
                 field, target, u2, joins, u3, u4 = self.setup_joins(
-                        name.split(LOOKUP_SEP), opts, alias, False, allow_m2m,
-                        True)
+                        name.split(LOOKUP_SEP), opts, alias, False, allow_m2m)
                 final_alias = joins[-1]
                 col = target.column
                 if len(joins) > 1: