Ticket #11900: 11900_patch_and_tests.diff

django/db/transaction.py

@@ -304 +304 @@
                     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)

tests/modeltests/transactions/models.py

@@ -130 +130 @@
 TransactionManagementError: Transaction managed block ended with pending COMMIT/ROLLBACK
 
 """
+
+# Test for bug 11900, better error handling for commits during commit_on_success blocks.
+# The bug has only been verified to occur 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 auth_user_groups (user_id, group_id) VALUES (1000000, 1000000);')
+...     transaction.set_dirty()
+...
+>>> execute_bad_sql = transaction.commit_on_success(execute_bad_sql)
+>>> execute_bad_sql()
+Traceback (most recent call last):
+    ...
+IntegrityError: insert or update on table "auth_user_groups" violates foreign key constraint "auth_user_groups_user_id_fkey"
+DETAIL:  Key (user_id)=(1000000) is not present in table "auth_user".
+"""
+ No newline at end of file