Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #1181 -- get_in_bulk no longer fails on empty input. Also added…

… unit tests. Thanks, akaihola

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bbfc645337610b4c974c4f5a225958367b4d294c 1 parent 7104000
@adrianholovaty adrianholovaty authored
View
1  AUTHORS
@@ -31,6 +31,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
+ akaihola
Andreas
David Ascher <http://ascher.ca/>
James Bennett
View
2  django/core/meta/__init__.py
@@ -1649,7 +1649,7 @@ def quote_only_if_word(word):
return select, " FROM " + ",".join(tables) + (where and " WHERE " + " AND ".join(where) or "") + (order_by and " ORDER BY " + order_by or "") + limit_sql, params
def function_get_in_bulk(opts, klass, *args, **kwargs):
- id_list = args and args[0] or kwargs['id_list']
+ id_list = args and args[0] or kwargs.get('id_list', [])
assert id_list != [], "get_in_bulk() cannot be passed an empty list."
kwargs['where'] = ["%s.%s IN (%s)" % (db.db.quote_name(opts.db_table), db.db.quote_name(opts.pk.column), ",".join(['%s'] * len(id_list)))]
kwargs['params'] = id_list
View
4 tests/testapp/models/lookup.py
@@ -65,6 +65,10 @@ def __repr__(self):
{3: Article 3}
>>> articles.get_in_bulk([1000])
{}
+>>> articles.get_in_bulk([])
+Traceback (most recent call last):
+ ...
+AssertionError: get_in_bulk() cannot be passed an empty list.
# get_values() is just like get_list(), except it returns a list of
# dictionaries instead of object instances -- and you can specify which fields
Please sign in to comment.
Something went wrong with that request. Please try again.