Ticket #2348: query.py.diff

query.py

@@ -836 +836 @@
                 new_column = new_opts.pk.column
                 join_column = field.column
 
-            raise FieldFound
+            # If there are still items on path but this is not a related field, we're stuck.
+            # Add first element of path to current field name so the TypeError raised
+            # below properly identifies the cause of the problem.
+            if path and not field.rel:
+                name += LOOKUP_SEPARATOR + path[0]
+            else:
+                raise FieldFound
 
     except FieldFound: # Match found, loop has been shortcut.
         pass