mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
Matt Johnson 2015-07-22 11:54:42 -07:00 • committed by Tim Graham
parent 71df9b7de4
commit e063ac2fae
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
django/db/models/query.py
View file

@ -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):