Ticket #13870: django-terminate-isolating-transactions.patch

django/db/backends/__init__.py

@@ -50 +50 @@
         """
         pass
 
+    def _terminate_transaction_isolation(self, commited):
+        """
+        A hook for backend-specific changes required to reset the transaction
+        isolation level.
+        """
+        pass
+
     def _savepoint(self, sid):
         if not self.features.uses_savepoints:
             return

django/db/backends/postgresql_psycopg2/base.py

@@ -176 +176 @@
         if self.features.uses_autocommit and not managed and self.isolation_level:
             self._set_isolation_level(0)
 
+    def _terminate_transaction_isolation(self, commited):
+        """
+        The transaction is over so if the isolation level is not zero,
+        terminate the isolating transaction.
+        """
+        if self.isolation_level and self.connection.get_transaction_status() == \
+                psycopg2.extensions.TRANSACTION_STATUS_INTRANS:
+            if commited:
+                self.connection.commit()
+            else:
+                self.connection.rollback()
+
     def _set_isolation_level(self, level):
         """
         Do all the related feature configurations for changing isolation

django/db/transaction.py

@@ -84 +84 @@
         raise TransactionManagementError("This code isn't under transaction management")
     if dirty.get(thread_ident, {}).get(using, False):
         rollback(using=using)
+        connection._terminate_transaction_isolation(False)
         raise TransactionManagementError("Transaction managed block ended with pending COMMIT/ROLLBACK")
+    else:
+        connection._terminate_transaction_isolation(True)
     dirty[thread_ident][using] = False
 
 def is_dirty(using=None):