Merge branch 'webb/django-sql-commit' into webb/django-sql-rollback

alexander-alderman-webb · alexander-alderman-webb · commit 7a1da453fda3 · 2025-11-24T15:46:21.000+01:00
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
@@ -256,8 +256,8 @@ def postgres_insert_orm_no_autocommit(request, *args, **kwargs):
         )
         transaction.commit(using="postgres")
     except Exception:
+        transaction.rollback(using="postgres")
         transaction.set_autocommit(True, using="postgres")
-        transaction.rollback()
         raise
 
     transaction.set_autocommit(True, using="postgres")

Original file line number	Diff line number	Diff line change
`@@ -256,8 +256,8 @@ def postgres_insert_orm_no_autocommit(request, args, *kwargs):`
`256`	`256`	`)`
`257`	`257`	`transaction.commit(using="postgres")`
`258`	`258`	`except Exception:`
	`259`	`+ transaction.rollback(using="postgres")`
`259`	`260`	`transaction.set_autocommit(True, using="postgres")`
`260`		`- transaction.rollback()`
`261`	`261`	`raise`
`262`	`262`
`263`	`263`	`transaction.set_autocommit(True, using="postgres")`