Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #11900 -- Corrected an edge case of transaction handling in the…

… commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ef0be292a687f95f1081b2ff8170fd7cbd5a365f 1 parent 615eab6
@freakboy3742 freakboy3742 authored
View
6 django/db/transaction.py
@@ -304,7 +304,11 @@ def _commit_on_success(*args, **kw):
raise
else:
if is_dirty(using=db):
- commit(using=db)
+ try:
+ commit(using=db)
+ except:
+ rollback(using=db)
+ raise
return res
finally:
leave_transaction_management(using=db)
View
21 tests/modeltests/transactions/models.py
@@ -130,3 +130,24 @@ def __unicode__(self):
TransactionManagementError: Transaction managed block ended with pending COMMIT/ROLLBACK
"""
+
+# Regression for #11900: If a function wrapped by commit_on_success writes a
+# transaction that can't be committed, that transaction should be rolled back.
+# The bug is only visible using the psycopg2 backend, though
+# the fix is generally a good idea.
+pgsql_backends = ('django.db.backends.postgresql_psycopg2', 'postgresql_psycopg2',)
+if building_docs or settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] in pgsql_backends:
+ __test__['API_TESTS'] += """
+>>> def execute_bad_sql():
+... cursor = connection.cursor()
+... cursor.execute("INSERT INTO transactions_reporter (first_name, last_name) VALUES ('Douglas', 'Adams');")
+... transaction.set_dirty()
+...
+>>> execute_bad_sql = transaction.commit_on_success(execute_bad_sql)
+>>> execute_bad_sql()
+Traceback (most recent call last):
+ ...
+IntegrityError: null value in column "email" violates not-null constraint
+<BLANKLINE>
+
+"""
Please sign in to comment.
Something went wrong with that request. Please try again.