Fixed #26884 -- Evaluated callables in QuerySet.update_or_create()'s …

…defaults when updating.
spookylukey · Jul 13, 2016 · 841cb45 · 841cb45
1 parent b84ecaa
commit 841cb45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/django/db/models/query.py b/django/db/models/query.py
@@ -489,7 +489,7 @@ def update_or_create(self, defaults=None, **kwargs):
             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
 

diff --git a/tests/get_or_create/tests.py b/tests/get_or_create/tests.py
@@ -404,9 +404,21 @@ def test_defaults_exact(self):
         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')