diff options
| -rw-r--r-- | django/db/models/query.py | 3 | ||||
| -rw-r--r-- | django/db/transaction.py | 13 |
2 files changed, 14 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 14d89dacae..9d46b4046d 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -326,9 +326,12 @@ class QuerySet(object): params = dict([(k, v) for k, v in kwargs.items() if '__' not in k]) params.update(defaults) obj = self.model(**params) + sid = transaction.savepoint() obj.save() + transaction.savepoint_commit(sid) return obj, True except IntegrityError, e: + transaction.savepoint_rollback(sid) return self.get(**kwargs), False def latest(self, field_name=None): diff --git a/django/db/transaction.py b/django/db/transaction.py index 55fad9e457..e5e8890ee7 100644 --- a/django/db/transaction.py +++ b/django/db/transaction.py @@ -105,6 +105,12 @@ def set_clean(): dirty[thread_ident] = False else: raise TransactionManagementError("This code isn't under transaction management") + clean_savepoints() + +def clean_savepoints(): + thread_ident = thread.get_ident() + if thread_ident in savepoint_state: + del savepoint_state[thread_ident] def is_managed(): """ @@ -139,6 +145,7 @@ def commit_unless_managed(): """ if not is_managed(): connection._commit() + clean_savepoints() else: set_dirty() @@ -186,14 +193,16 @@ def savepoint_rollback(sid): Rolls back the most recent savepoint (if one exists). Does nothing if savepoints are not supported. """ - connection._savepoint_rollback(sid) + if thread.get_ident() in savepoint_state: + connection._savepoint_rollback(sid) def savepoint_commit(sid): """ Commits the most recent savepoint (if one exists). Does nothing if savepoints are not supported. """ - connection._savepoint_commit(sid) + if thread.get_ident() in savepoint_state: + connection._savepoint_commit(sid) ############## # DECORATORS # |