Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2304 -- Documented TRANSACTIONS_MANAGED.

  • Loading branch information...
commit a001f3c31e751e6ab1622ae7f65f7f8aeca2ef9a 1 parent 7eba5fb
@aaugustin aaugustin authored
View
2  django/db/backends/__init__.py
@@ -181,8 +181,6 @@ def is_managed(self):
"""
if self.transaction_state:
return self.transaction_state[-1]
- # Note that this setting isn't documented, and is only used here, and
- # in enter_transaction_management()
return settings.TRANSACTIONS_MANAGED
def managed(self, flag=True):
View
10 docs/ref/settings.txt
@@ -2069,6 +2069,16 @@ to ensure your processes are running in the correct environment.
.. _pytz: http://pytz.sourceforge.net/
+.. setting:: TRANSACTIONS_MANAGED
+
+TRANSACTIONS_MANAGED
+--------------------
+
+Default: ``False``
+
+Set this to ``True`` if you want to :ref:`disable Django's transaction
+management <deactivate-transaction-management>` and implement your own.
+
.. setting:: USE_ETAGS
USE_ETAGS
View
4 docs/topics/db/transactions.txt
@@ -208,11 +208,13 @@ This applies to all database operations, not just write operations. Even
if your transaction only reads from the database, the transaction must
be committed or rolled back before you complete a request.
+.. _deactivate-transaction-management:
+
How to globally deactivate transaction management
=================================================
Control freaks can totally disable all transaction management by setting
-``DISABLE_TRANSACTION_MANAGEMENT`` to ``True`` in the Django settings file.
+:setting:`TRANSACTIONS_MANAGED` to ``True`` in the Django settings file.
If you do this, Django won't provide any automatic transaction management
whatsoever. Middleware will no longer implicitly commit transactions, and
Please sign in to comment.
Something went wrong with that request. Please try again.