Fixed #12768 -- Fixed QuerySet.raw() regression on FK with custom db_column.

1 files changed, 3 insertions, 3 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 96ecdbc1f4..c147928759 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1196,11 +1196,11 @@ class RawQuerySet(object):
         """
         Resolve the init field names and value positions
         """
-        model_init_names = [f.attname for f in self.model._meta.fields
-                            if f.attname in self.columns]
+        model_init_fields = [f for f in self.model._meta.fields if f.column in self.columns]
         annotation_fields = [(column, pos) for pos, column in enumerate(self.columns)
                              if column not in self.model_fields]
-        model_init_order = [self.columns.index(fname) for fname in model_init_names]
+        model_init_order = [self.columns.index(f.column) for f in model_init_fields]
+        model_init_names = [f.attname for f in model_init_fields]
         return model_init_names, model_init_order, annotation_fields
 
     def __iter__(self):