remove durable

Author: timgraham

django_mongodb_backend/transaction.py

@@ -30,24 +30,13 @@ class Atomic(ContextDecorator):
     `with oa:` multiple times.
 
     Since database connections are thread-local, this is thread-safe.
-
-    An atomic block can be tagged as durable. In this case, a RuntimeError is
-    raised if it's nested within another atomic block. This guarantees
-    that database changes in a durable block are committed to the database when
-    the block exits without error.
     """
 
-    def __init__(self, using, durable):
+    def __init__(self, using):
         self.using = using
-        self.durable = durable
 
     def __enter__(self):
         connection = get_connection(self.using)
-
-        if self.durable and connection.atomic_blocks_mongo:
-            raise RuntimeError(
-                "A durable atomic block cannot be nested within another atomic block."
-            )
         if not connection.in_atomic_block_mongo:
             # Reset state when entering an outermost atomic block.
             connection.commit_on_exit_mongo = True
@@ -123,10 +112,10 @@ def __exit__(self, exc_type, exc_value, traceback):
                 connection.in_atomic_block_mongo = False
 
 
-def atomic(using=None, durable=False):
+def atomic(using=None):
     # Bare decorator: @atomic -- although the first argument is called
     # `using`, it's actually the function being decorated.
     if callable(using):
-        return Atomic(DEFAULT_DB_ALIAS, durable)(using)
+        return Atomic(DEFAULT_DB_ALIAS)(using)
     # Decorator: @atomic(...) or context manager: with atomic(...): ...
-    return Atomic(using, durable)
+    return Atomic(using)

docs/source/topics/transactions.rst

@@ -23,7 +23,7 @@ autocommit mode. Each query is immediately committed to the database.
 Controlling transactions
 ========================
 
-.. function:: atomic(using=None, durable=False)
+.. function:: atomic(using=None)
 
     Atomicity is the defining property of database transactions. ``atomic`` allows
     creating a block of code within which the atomicity on the database is guaranteed.

tests/transactions_/tests.py

@@ -160,48 +160,3 @@ def __call__(self):
 
         # Must not raise an exception
         transaction.atomic(Callable())
-
-
-class DurableTests(TransactionTestCase):
-    available_apps = ["transactions_"]
-
-    def test_commit(self):
-        with transaction.atomic(durable=True):
-            reporter = Reporter.objects.create(first_name="Tintin")
-        self.assertEqual(Reporter.objects.get(), reporter)
-
-    def test_nested_outer_durable(self):
-        with transaction.atomic(durable=True):
-            reporter1 = Reporter.objects.create(first_name="Tintin")
-            with transaction.atomic():
-                reporter2 = Reporter.objects.create(
-                    first_name="Archibald",
-                    last_name="Haddock",
-                )
-        self.assertSequenceEqual(Reporter.objects.all(), [reporter2, reporter1])
-
-    def test_nested_both_durable(self):
-        msg = "A durable atomic block cannot be nested within another atomic block."
-        with (
-            transaction.atomic(durable=True),
-            self.assertRaisesMessage(RuntimeError, msg),
-            transaction.atomic(durable=True),
-        ):
-            pass
-
-    def test_nested_inner_durable(self):
-        msg = "A durable atomic block cannot be nested within another atomic block."
-        with (
-            transaction.atomic(),
-            self.assertRaisesMessage(RuntimeError, msg),
-            transaction.atomic(durable=True),
-        ):
-            pass
-
-    def test_sequence_of_durables(self):
-        with transaction.atomic(durable=True):
-            reporter = Reporter.objects.create(first_name="Tintin 1")
-        self.assertEqual(Reporter.objects.get(first_name="Tintin 1"), reporter)
-        with transaction.atomic(durable=True):
-            reporter = Reporter.objects.create(first_name="Tintin 2")
-        self.assertEqual(Reporter.objects.get(first_name="Tintin 2"), reporter)