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

Moved misplaced transaction.atomic from 0dce44e16b 

Thanks Florian Apolloner for noticing the issue and Aymeric
Augustin for the expertise.
Refs #22540.
This commit is contained in:
Claude Paroz 2014-05-03 23:34:55 +02:00
parent 3818d96426
commit faa8c71fd9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,8 +364,7 @@ class QuerySet(object):
""" """
obj = self.model(**kwargs) obj = self.model(**kwargs)
self._for_write = True self._for_write = True
with transaction.atomic(using=self.db): obj.save(force_insert=True, using=self.db)
obj.save(force_insert=True, using=self.db)
return obj return obj
def bulk_create(self, objs, batch_size=None): def bulk_create(self, objs, batch_size=None):
@ -448,7 +447,8 @@ class QuerySet(object):
Used by get_or_create and update_or_create Used by get_or_create and update_or_create
""" """
try: try:
obj = self.create(**params) with transaction.atomic(using=self.db):
obj = self.create(**params)
return obj, True return obj, True
except IntegrityError: except IntegrityError:
exc_info = sys.exc_info() exc_info = sys.exc_info()