apply data migration in the same transaction block with schema migration

src/ahriman/core/database/data/__init__.py

@@ -24,11 +24,10 @@ from ahriman.core.database.data.package_statuses import migrate_package_statuses
 from ahriman.core.database.data.patches import migrate_patches
 from ahriman.core.database.data.users import migrate_users_data
 from ahriman.models.migration_result import MigrationResult
-from ahriman.models.repository_paths import RepositoryPaths
 
 
-def migrate_data(result: MigrationResult, connection: Connection,
-                 configuration: Configuration, paths: RepositoryPaths) -> None:
+def migrate_data(
+        result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
     """
     perform data migration
 
@@ -36,10 +35,11 @@ def migrate_data(result: MigrationResult, connection: Connection,
         result(MigrationResult): result of the schema migration
         connection(Connection): database connection
         configuration(Configuration): configuration instance
-        paths(RepositoryPaths): repository paths instance
     """
     # initial data migration
+    repository_paths = configuration.repository_paths
+
     if result.old_version <= 0:
-        migrate_package_statuses(connection, paths)
-        migrate_patches(connection, paths)
+        migrate_package_statuses(connection, repository_paths)
+        migrate_patches(connection, repository_paths)
         migrate_users_data(connection, configuration)

src/ahriman/core/database/data/package_statuses.py

@@ -77,6 +77,3 @@ def migrate_package_statuses(connection: Connection, paths: RepositoryPaths) ->
         status = BuildStatus.from_json(item["status"])
         insert_base(package, status)
         insert_packages(package)
-
-    connection.commit()
-    cache_path.unlink()

src/ahriman/core/database/data/patches.py

@@ -42,5 +42,3 @@ def migrate_patches(connection: Connection, paths: RepositoryPaths) -> None:
         connection.execute(
             """insert into patches (package_base, patch) values (:package_base, :patch)""",
             {"package_base": package.name, "patch": content})
-
-    connection.commit()

src/ahriman/core/database/data/users.py

@@ -38,5 +38,3 @@ def migrate_users_data(connection: Connection, configuration: Configuration) ->
             connection.execute(
                 """insert into users (username, access, password) values (:username, :access, :password)""",
                 {"username": option.lower(), "access": access, "password": value})
-
-    connection.commit()

src/ahriman/core/database/migrations/__init__.py

@@ -27,6 +27,8 @@ from pkgutil import iter_modules
 from sqlite3 import Connection
 from typing import List, Type
 
+from ahriman.core.configuration import Configuration
+from ahriman.core.database.data import migrate_data
 from ahriman.models.migration import Migration
 from ahriman.models.migration_result import MigrationResult
 
@@ -37,32 +39,36 @@ class Migrations:
     idea comes from https://www.ash.dev/blog/simple-migration-system-in-sqlite/
 
     Attributes:
+        configuration(Configuration): configuration instance
         connection(Connection): database connection
         logger(logging.Logger): class logger
     """
 
-    def __init__(self, connection: Connection) -> None:
+    def __init__(self, connection: Connection, configuration: Configuration) -> None:
         """
         default constructor
 
         Args:
             connection(Connection): database connection
+            configuration(Configuration): configuration instance
         """
         self.connection = connection
+        self.configuration = configuration
         self.logger = logging.getLogger("database")
 
     @classmethod
-    def migrate(cls: Type[Migrations], connection: Connection) -> MigrationResult:
+    def migrate(cls: Type[Migrations], connection: Connection, configuration: Configuration) -> MigrationResult:
         """
         perform migrations implicitly
 
         Args:
             connection(Connection): database connection
+            configuration(Configuration): configuration instance
 
         Returns:
             MigrationResult: current schema version
         """
-        return cls(connection).run()
+        return cls(connection, configuration).run()
 
     def migrations(self) -> List[Migration]:
         """
@@ -112,6 +118,8 @@ class Migrations:
                         cursor.execute(statement)
                     self.logger.info("migration %s at index %s has been applied", migration.name, migration.index)
 
+                migrate_data(result, self.connection, self.configuration)
+
                 cursor.execute(f"pragma user_version = {expected_version}")  # no support for ? placeholders
             except Exception:
                 self.logger.exception("migration failed with exception")

src/ahriman/core/database/sqlite.py

@@ -23,11 +23,9 @@ import json
 import sqlite3
 
 from pathlib import Path
-from sqlite3 import Connection
 from typing import Type
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.data import migrate_data
 from ahriman.core.database.migrations import Migrations
 from ahriman.core.database.operations.auth_operations import AuthOperations
 from ahriman.core.database.operations.build_operations import BuildOperations
@@ -83,9 +81,5 @@ class SQLite(AuthOperations, BuildOperations, PackageOperations, PatchOperations
 
         paths = configuration.repository_paths
 
-        def run(connection: Connection) -> None:
-            result = Migrations.migrate(connection)
-            migrate_data(result, connection, configuration, paths)
-
-        self.with_connection(run)
+        self.with_connection(lambda conn: Migrations.migrate(conn, configuration))
         paths.chown(self.path)