idempotent connect and disconnect (#379)

Co-authored-by: Amin Alaee <[email protected]>

Author: sondrelg

databases/core.py

@@ -81,7 +81,9 @@ async def connect(self) -> None:
         """
         Establish the connection pool.
         """
-        assert not self.is_connected, "Already connected."
+        if self.is_connected:
+            logger.debug("Already connected, skipping connection")
+            return None
 
         await self._backend.connect()
         logger.info(
@@ -104,7 +106,9 @@ async def disconnect(self) -> None:
         """
         Close all connections in the connection pool.
         """
-        assert self.is_connected, "Already disconnected."
+        if not self.is_connected:
+            logger.debug("Already disconnected, skipping disconnection")
+            return None
 
         if self._force_rollback:
             assert self._global_connection is not None

tests/test_databases.py

@@ -737,6 +737,14 @@ async def test_connect_and_disconnect(database_url):
     await database.disconnect()
     assert not database.is_connected
 
+    # connect and disconnect idempotence
+    await database.connect()
+    await database.connect()
+    assert database.is_connected
+    await database.disconnect()
+    await database.disconnect()
+    assert not database.is_connected
+
 
 @pytest.mark.parametrize("database_url", DATABASE_URLS)
 @async_adapter