p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #26884 -- Evaluated callables in QuerySet.update_or_create()'s defaults when updating.

This commit is contained in:
Kenneth 2016-07-12 14:32:55 -07:00 committed by Tim Graham
parent b84ecaa736
commit 841cb45847
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -489,7 +489,7 @@ class QuerySet(object):
if created:
return obj, created
for k, v in six.iteritems(defaults):
setattr(obj, k, v)
setattr(obj, k, v() if callable(v) else v)
obj.save(using=self.db)
return obj, False

14
tests/get_or_create/tests.py
View File

@ -404,9 +404,21 @@ class UpdateOrCreateTests(TestCase):
self.assertFalse(created)
self.assertEqual(obj.defaults, 'another testing')
def test_update_callable_default(self):
def test_create_callable_default(self):
obj, created = Person.objects.update_or_create(
first_name='George', last_name='Harrison',
defaults={'birthday': lambda: date(1943, 2, 25)},
)
self.assertIs(created, True)
self.assertEqual(obj.birthday, date(1943, 2, 25))
def test_update_callable_default(self):
Person.objects.update_or_create(
first_name='George', last_name='Harrison', birthday=date(1942, 2, 25),
)
obj, created = Person.objects.update_or_create(
first_name='George',
defaults={'last_name': lambda: 'NotHarrison'},
)
self.assertIs(created, False)
self.assertEqual(obj.last_name, 'NotHarrison')