From 1194a9699932088385f9f88869be28a251597f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= Date: Thu, 15 Nov 2012 20:17:57 +0200 Subject: [PATCH] Fixed a regression in select_related The regression was caused by the fix for #13781 (commit f51e409a5fb34020e170494320a421503689aea0). Reason was leaving off some crucial lines when resolving a merge conflict. --- django/db/models/query.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/django/db/models/query.py b/django/db/models/query.py index d5379a5f6a..130be9ad96 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1446,6 +1446,10 @@ def get_cached_row(row, index_start, using, klass_info, offset=0, if fields[pk_idx] == None or fields[pk_idx] == '': obj = None elif field_names: + fields = list(fields) + for rel_field, value in parent_data: + field_names.append(rel_field.attname) + fields.append(value) obj = klass(**dict(zip(field_names, fields))) else: obj = klass(*fields)