mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-23 01:25:58 +00:00
Code Issues 25 Releases Wiki Activity

Ensure bulk_create returns what it is supposed to.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2011-09-10 21:44:57 +00:00
parent e95d0afe9e
commit f2bc919ec0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/models/query.py
View File

@ -388,6 +388,7 @@ class QuerySet(object):
self.model._base_manager._insert(objs_with_pk, fields=fields, using=self.db)
if objs_without_pk:
self.model._base_manager._insert(objs_without_pk, fields=[f for f in fields if not isinstance(f, AutoField)], using=self.db)
return objs
def get_or_create(self, **kwargs):
"""

3
tests/regressiontests/bulk_create/tests.py
View File

@ -17,7 +17,8 @@ class BulkCreateTests(TestCase):
]
def test_simple(self):
Country.objects.bulk_create(self.data)
created = Country.objects.bulk_create(self.data)
self.assertEqual(len(created), 4)
self.assertQuerysetEqual(Country.objects.order_by("-name"), [
"United States of America", "The Netherlands", "Germany", "Czech Republic"
], attrgetter("name"))