Fix: testclient can break with force_rollback on (especially drop_all)

databasez/core/database.py

@@ -232,7 +232,7 @@ async def decr_refcount(self) -> bool:
         return False
 
     async def connect_hook(self) -> None:
-        """Refcount protected connect hook"""
+        """Refcount protected connect hook. Executed after engine and before global connection setup."""
 
     async def connect(self) -> bool:
         """
@@ -247,13 +247,13 @@ async def connect(self) -> bool:
         self.is_connected = True
 
         assert self._global_connection is None
+        await self.connect_hook()
 
         self._global_connection = Connection(self, self.backend, force_rollback=True)
-        await self.connect_hook()
         return True
 
     async def disconnect_hook(self) -> None:
-        """Refcount protected disconnect hook"""
+        """Refcount protected disconnect hook. Executed after connection cleanup but before engine disconnect."""
 
     async def disconnect(self, force: bool = False) -> bool:
         """
@@ -268,13 +268,13 @@ async def disconnect(self, force: bool = False) -> bool:
             else:
                 return False
 
-        assert self._global_connection is not None
         try:
-            await self.disconnect_hook()
-        finally:
+            assert self._global_connection is not None
             await self._global_connection.__aexit__()
             self._global_connection = None
             self._connection = None
+            await self.disconnect_hook()
+        finally:
             try:
                 await self.backend.disconnect()
                 logger.info(

databasez/testclient.py

@@ -187,6 +187,7 @@ async def create_database(
         dialect_name = url.sqla_url.get_dialect(True).name
         dialect_driver = url.sqla_url.get_dialect(True).driver
 
+        # we don't want to connect to a not existing db
         if dialect_name == "postgresql":
             url = url.replace(database="postgres")
         elif dialect_name == "mssql":
@@ -223,6 +224,7 @@ async def create_database(
 
             elif dialect_name == "sqlite" and database != ":memory:":
                 if database:
+                    # create a sqlite file
                     async with db_client.engine.begin() as conn:  # type: ignore
                         await conn.execute(sa.text("CREATE TABLE DB(id int)"))
                         await conn.execute(sa.text("DROP TABLE DB"))

docs/release-notes.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+
+## 0.9.5
+
+### Fixed
+
+- `disconnect_hook` was called too early.
+- `connect_hook` was called too late.
+
 ## 0.9.4
 
 ### Changed