Remove sync code

Author: Lode Rosseel

docs/database.rst

@@ -118,7 +118,7 @@ When using the database in a test with transaction rollback, you must ensure tha
 database access is only done from the same thread that the test is running on.
 
 To avoid your fixtures/tests making changes outside the test thread, and as a result, the transaction, pytest-django
-actively restricts where database connections may be opened:
+actively restricts where database connections may be opened in async tests:
 
 - In async tests using ``db``: database access is only allowed from the single
   thread used by ``SyncToAsync``. Using sync fixtures that touch the database in
@@ -132,14 +132,6 @@ actively restricts where database connections may be opened:
   or by requesting ``transactional_db`` if you must keep sync fixtures.
   See :ref:`async-db-behavior` for more details.
 
-- In sync tests: database access is only allowed from the main thread. Attempting to use the database connection
-  from a different thread will raise::
-
-      RuntimeError: Database access is only allowed in the main thread, modify your
-      test fixtures to be sync or use the transactional_db fixture.
-
-  Fix this by ensuring all database transactions run in the main thread (e.g., avoiding the use of async fixtures),
-  or use ``transactional_db`` to allow mixing.
 
 
 .. _`multi-db`:

pytest_django/fixtures.py

@@ -282,7 +282,7 @@ def _sync_django_db_helper(
         "django_db_serialized_rollback" in request.fixturenames
     )
 
-    with django_db_blocker.unblock(sync_only=not transactional):
+    with django_db_blocker.unblock():
         import django.db
         import django.test
 

pytest_django/plugin.py

@@ -57,7 +57,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Any, NoReturn, Callable
+    from typing import Any, Callable, NoReturn
 
     import django
 
@@ -857,7 +857,7 @@ def _unblocked_async_only(self, wrapper_self: Any, *args, **kwargs):
                 "modify your test fixtures to be async or use the transactional_db fixture."
                 "See https://pytest-django.readthedocs.io/en/latest/database.html#db-thread-safeguards for more information."
             )
-        elif self._real_ensure_connection is not None:
+        if self._real_ensure_connection is not None:
             self._real_ensure_connection(wrapper_self, *args, **kwargs)
 
     def _unblocked_sync_only(self, wrapper_self: Any, *args, **kwargs):
@@ -868,21 +868,13 @@ def _unblocked_sync_only(self, wrapper_self: Any, *args, **kwargs):
                 "modify your test fixtures to be sync or use the transactional_db fixture."
                 "See https://pytest-django.readthedocs.io/en/latest/database.html#db-thread-safeguards for more information."
             )
-        elif self._real_ensure_connection is not None:
+        if self._real_ensure_connection is not None:
             self._real_ensure_connection(wrapper_self, *args, **kwargs)
 
-    def unblock(self, sync_only=False, async_only=False) -> AbstractContextManager[None]:
+    def unblock(self, async_only=False) -> AbstractContextManager[None]:
         """Enable access to the Django database."""
-        if sync_only and async_only:
-            raise ValueError("Cannot use both sync_only and async_only. Choose at most one.")
         self._save_active_wrapper()
-        if sync_only:
-
-            def _method(wrapper_self, *args, **kwargs):
-                return self._unblocked_sync_only(wrapper_self, *args, **kwargs)
-
-            self._dj_db_wrapper.ensure_connection = _method
-        elif async_only:
+        if async_only:
 
             def _method(wrapper_self, *args, **kwargs):
                 return self._unblocked_async_only(wrapper_self, *args, **kwargs)

tests/test_db_thread_safeguards.py

@@ -788,13 +788,6 @@ def test_unblock_with_block(self, django_db_blocker: DjangoDbBlocker) -> None:
         with django_db_blocker.unblock():
             Item.objects.exists()
 
-    def test_unblock_with_both_flags_raises_valueerror(
-        self, django_db_blocker: DjangoDbBlocker
-    ) -> None:
-        # When both sync_only and async_only are True, unblock should reject with ValueError
-        with pytest.raises(ValueError, match="Cannot use both sync_only and async_only"):
-            django_db_blocker.unblock(sync_only=True, async_only=True)
-
 
 def test_mail(mailoutbox) -> None:
     assert mailoutbox is mail.outbox  # check that mail.outbox and fixture value is same object