Ticket #6639: query_patch.diff

Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/django/db/models/query.py

@@ -1023 +1022 @@
             if field.rel: # One-to-One/Many-to-one field
                 new_table = current_table + '__' + name
                 new_opts = field.rel.to._meta
-                new_column = new_opts.pk.column
+                if hasattr(field.rel, 'field_name'):
+                    to_fields = field.rel.to._meta.fields
+                    to_fields_names = map(lambda x: x.name, to_fields)
+                    new_column = to_fields[to_fields_names.index(field.rel.field_name)].db_column
+                else:
+                    new_column = new_opts.pk.column
                 join_column = field.column
                 raise FieldFound
             elif path: