Commit 423b3afc authored by Ed Bartosh's avatar Ed Bartosh Committed by Tim Graham
Browse files

Fixed #25939 -- Removed redundant transaction in QuerySet.update_or_create(). 

There is no need to wrap the save() call in transaction.atomic() as
it's already done down the call stack in Model.save_base().
parent 5146e2cf

django/db/models/query.py

+1 −3
Original line number Diff line number Diff line
@@ -484,8 +484,6 @@ class QuerySet(object): 
                return obj, created

        for k, v in six.iteritems(defaults):

            setattr(obj, k, v)



        with transaction.atomic(using=self.db, savepoint=False):

        obj.save(using=self.db)

        return obj, False

docs/releases/1.10.txt

+4 −0
Original line number Diff line number Diff line
@@ -363,6 +363,10 @@ Miscellaneous 
  :class:`~django.http.HttpResponse` are now closed immediately instead of when

  the WSGI server calls ``close()`` on the response.



* A redundant ``transaction.atomic()`` call in ``QuerySet.update_or_create()``

  is removed. This may affect query counts tested by

  ``TransactionTestCase.assertNumQueries()``.



.. _deprecated-features-1.10:



Features deprecated in 1.10