Commit 1194a969 authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

Fixed a regression in select_related 

The regression was caused by the fix for #13781 (commit
f51e409a). Reason was leaving
off some crucial lines when resolving a merge conflict.
parent 71e14cf3

django/db/models/query.py

+4 −0
Original line number Diff line number Diff line
@@ -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)