diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index e5e11f472a..b55de3d766 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1791,13 +1791,18 @@ class Query(object): existing immediate values, but respects existing deferrals.) """ existing, defer = self.deferred_loading + field_names = set(field_names) + if 'pk' in field_names: + field_names.remove('pk') + field_names.add(self.model._meta.pk.name) + if defer: # Remove any existing deferred names from the current set before # setting the new names. - self.deferred_loading = set(field_names).difference(existing), False + self.deferred_loading = field_names.difference(existing), False else: # Replace any existing "immediate load" field names. - self.deferred_loading = set(field_names), False + self.deferred_loading = field_names, False def get_loaded_field_names(self): """ |