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

Fixed #27970 -- Allowed QuerySet.in_bulk() to fetch on fields besides primary key.

Browse source
This commit is contained in:
Tom Carrick 2017-03-28 16:57:23 +01:00 • committed by Tim Graham
parent 76236f0db2
commit 3159ad4df6
5 changed files with 84 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -560,16 +560,19 @@ class QuerySet:
return objects[0]
return None
def in_bulk(self, id_list=None):
def in_bulk(self, id_list=None, *, field_name='pk'):
"""
Return a dictionary mapping each of the given IDs to the object with
that ID. If `id_list` isn't provided, evaluate the entire QuerySet.
"""
assert self.query.can_filter(), \
"Cannot use 'limit' or 'offset' with in_bulk"
if field_name != 'pk' and not self.model._meta.get_field(field_name).unique:
raise ValueError("in_bulk()'s field_name must be a unique field but %r isn't." % field_name)
if id_list is not None:
if not id_list:
return {}
filter_key = '{}__in'.format(field_name)
batch_size = connections[self.db].features.max_query_params
id_list = tuple(id_list)
# If the database has a limit on the number of query parameters
@ -578,12 +581,12 @@ class QuerySet:
qs = ()
for offset in range(0, len(id_list), batch_size):
batch = id_list[offset:offset + batch_size]
qs += tuple(self.filter(pk__in=batch).order_by())
qs += tuple(self.filter(**{filter_key: batch}).order_by())
else:
qs = self.filter(pk__in=id_list).order_by()
qs = self.filter(**{filter_key: id_list}).order_by()
else:
qs = self._clone()
return {obj.pk: obj for obj in qs}
return {getattr(obj, field_name): obj for obj in qs}
def delete(self):
"""Delete the records in the current QuerySet."""