Fix rebase of branches using upgrade command

Author: gmazoyer

backend/infrahub/cli/db.py

@@ -371,20 +371,24 @@ async def trigger_rebase_branches(db: InfrahubDatabase) -> None:
 
     for branch in branches:
         if branch.graph_version == GRAPH_VERSION:
+            rprint(
+                f"Ignoring branch rebase and migrations for '{branch.name}' (ID: {branch.uuid}), it is already up-to-date"
+            )
             continue
 
         rprint(f"Rebasing branch '{branch.name}' (ID: {branch.uuid})...", end="")
         try:
+            await registry.schema.load_schema(db=db, branch=branch)
             await rebase_branch(
                 branch=branch.name,
                 context=InfrahubContext.init(
                     branch=branch, account=AccountSession(auth_type=AuthType.NONE, authenticated=False, account_id="")
                 ),
                 send_events=False,
             )
-            rprint("done")
+            rprint(SUCCESS_BADGE)
         except ValidationError:
-            rprint("failed")
+            rprint(FAILED_BADGE)
 
 
 async def initialize_internal_schema() -> None:

backend/infrahub/core/branch/tasks.py

@@ -232,6 +232,7 @@ async def migrate_branch(branch: str, context: InfrahubContext, send_events: boo
     await obj.save(db=db)
 
     try:
+        log.info(f"Running migrations for branch '{obj.name}'")
         await migration_runner.run(db=db)
     except MigrationFailureError as exc:
         log.error(f"Failed to migrate branch '{obj.name}': {exc.errors}")

backend/infrahub/core/migrations/shared.py

@@ -239,7 +239,9 @@ async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
         raise NotImplementedError()
 
     async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+        """Method that will be run against non-default branches, it assumes that the branches have been rebased."""
         raise NotImplementedError()
 
     async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        """Method that will be run against the default branch."""
         raise NotImplementedError()