ensure database index manager uses the correct database object

backend/infrahub/database/__init__.py

@@ -44,8 +44,6 @@
     from infrahub.core.schema import MainSchemaTypes, NodeSchema
     from infrahub.core.schema.schema_branch import SchemaBranch
 
-    from .manager import DatabaseManager
-
 validated_database = {}
 R = TypeVar("R")
 
@@ -134,7 +132,6 @@ def __init__(
         mode: InfrahubDatabaseMode = InfrahubDatabaseMode.DRIVER,
         db_type: DatabaseType | None = None,
         default_neo4j_runtime: Neo4jRuntime = Neo4jRuntime.DEFAULT,
-        db_manager: DatabaseManager | None = None,
         schemas: list[SchemaBranch] | None = None,
         session: AsyncSession | None = None,
         session_mode: InfrahubDatabaseSessionMode = InfrahubDatabaseSessionMode.WRITE,
@@ -161,10 +158,7 @@ def __init__(
         else:
             self.db_type = config.SETTINGS.database.db_type
 
-        if db_manager:
-            self.manager = db_manager
-            self.manager.db = self
-        elif self.db_type == DatabaseType.NEO4J:
+        if self.db_type == DatabaseType.NEO4J:
             self.manager = DatabaseManagerNeo4j(db=self)
         elif self.db_type == DatabaseType.MEMGRAPH:
             self.manager = DatabaseManagerMemgraph(db=self)
@@ -228,7 +222,6 @@ def start_session(self, read_only: bool = False, schemas: list[SchemaBranch] | N
             db_type=self.db_type,
             default_neo4j_runtime=self.default_neo4j_runtime,
             schemas=schemas or self._schemas.values(),
-            db_manager=self.manager,
             driver=self._driver,
             session_mode=session_mode,
             queries_names_to_config=self.queries_names_to_config,
@@ -243,7 +236,6 @@ def start_transaction(self, schemas: list[SchemaBranch] | None = None) -> Infrah
             db_type=self.db_type,
             default_neo4j_runtime=self.default_neo4j_runtime,
             schemas=schemas or self._schemas.values(),
-            db_manager=self.manager,
             driver=self._driver,
             session=self._session,
             session_mode=self._session_mode,

backend/tests/unit/core/migrations/graph/test_023.py

@@ -76,10 +76,6 @@ async def test_migration_023(db: InfrahubDatabase, branch, car_person_schema, re
     )
 
     migration = Migration023()
-    # Avoid error during initialization: uninitialize indexes so that the migration script doesn't try to add indexes
-    # Otherwise index manager tries to open a new transaction using an old InfrahubDatabase reference (it's not using the Migration transaction)
-    # That makes the db initialization phase fail early
-    db.manager.index.initialized = False
     await migration.execute(db=db)
     await migration.validate_migration(db=db)
 

backend/tests/unit/core/migrations/graph/test_024.py

@@ -92,10 +92,6 @@ async def test_hierarchy_fix_migration(
         default_schema_branch = registry.schema.get_schema_branch(name=registry.default_branch)
         await registry.schema.load_schema_to_db(db=db, schema=default_schema_branch)
         migration = Migration024()
-        # Avoid error during initialization: uninitialize indexes so that the migration script doesn't try to add indexes
-        # Otherwise index manager tries to open a new transaction using an old InfrahubDatabase reference (it's not using the Migration transaction)
-        # That makes the db initialization phase fail early
-        db.manager.index.initialized = False
         mock_schema_manager = MagicMock(wraps=registry.schema)
         mock_load_schema_from_db = AsyncMock(return_value=default_schema_branch)
         mock_schema_manager.load_schema_from_db = mock_load_schema_from_db