refactor: inline TableMigrations into store constructors
lint / lint (push) Successful in 1m59s
test / unit (pull_request) Successful in 57s
test / integration (pull_request) Successful in 20s
test / coverage (pull_request) Successful in 1m4s

Move _MIGRATIONS from module scope into AuditStore.__init__ and
QueueStore.__init__, treating table schema as a hidden implementation
detail of each store class.
This commit is contained in:
2026-07-06 19:12:45 +00:00
parent 9fb83ef1b0
commit 041d9bbbf5
2 changed files with 52 additions and 56 deletions
+9 -11
View File
@@ -15,10 +15,14 @@ except ImportError:
from migrations import TableMigrations # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module from migrations import TableMigrations # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module
# One entry per schema version: _MIGRATIONS.migrations[0] brings a fresh DB class AuditStore(DbStore):
# to version 1, [1] to version 2, and so on. Add new migrations at the end; """SQLite-backed persistent store for supervise audit entries."""
# never edit existing ones.
_MIGRATIONS = TableMigrations("audit_store", [ def __init__(self, db_path: Path | None = None) -> None:
# One entry per schema version: migrations[0] brings a fresh DB to
# version 1, [1] to version 2, etc. Add new entries at the end; never
# edit existing ones.
migrations = TableMigrations("audit_store", [
# v1 — initial schema # v1 — initial schema
""" """
CREATE TABLE IF NOT EXISTS supervise_audit_entries ( CREATE TABLE IF NOT EXISTS supervise_audit_entries (
@@ -33,13 +37,7 @@ _MIGRATIONS = TableMigrations("audit_store", [
) )
""", """,
]) ])
super().__init__(db_path or host_db_path(), migrations)
class AuditStore(DbStore):
"""SQLite-backed persistent store for supervise audit entries."""
def __init__(self, db_path: Path | None = None) -> None:
super().__init__(db_path or host_db_path(), _MIGRATIONS)
def write_audit_entry(self, entry: AuditEntry) -> Path: def write_audit_entry(self, entry: AuditEntry) -> Path:
with self._connect() as conn: with self._connect() as conn:
+18 -20
View File
@@ -16,10 +16,23 @@ except ImportError:
from migrations import TableMigrations # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module from migrations import TableMigrations # type: ignore[import-not-found] # pylint: disable=import-error,no-name-in-module
# One entry per schema version: _MIGRATIONS.migrations[0] brings a fresh DB class QueueStore(DbStore):
# to version 1, [1] to version 2, and so on. Add new migrations at the end; """SQLite-backed persistent store for supervise proposals and responses."""
# never edit existing ones.
_MIGRATIONS = TableMigrations("queue_store", [ def __init__(self, queue_key: str, db_path: Path | None = None) -> None:
self.queue_key = queue_key
if db_path is not None:
resolved = db_path
else:
# In the sidecar container SUPERVISE_DB_PATH points at the
# bind-mounted host DB. On the host this env var is never set,
# so we always fall through to host_db_path().
env_path = os.environ.get("SUPERVISE_DB_PATH", "").strip()
resolved = Path(env_path) if env_path else host_db_path()
# One entry per schema version: migrations[0] brings a fresh DB to
# version 1, [1] to version 2, etc. Add new entries at the end; never
# edit existing ones.
migrations = TableMigrations("queue_store", [
# v1 — proposals table # v1 — proposals table
""" """
CREATE TABLE IF NOT EXISTS supervise_proposals ( CREATE TABLE IF NOT EXISTS supervise_proposals (
@@ -48,22 +61,7 @@ _MIGRATIONS = TableMigrations("queue_store", [
) )
""", """,
]) ])
super().__init__(resolved, migrations)
class QueueStore(DbStore):
"""SQLite-backed persistent store for supervise proposals and responses."""
def __init__(self, queue_key: str, db_path: Path | None = None) -> None:
self.queue_key = queue_key
if db_path is not None:
resolved = db_path
else:
# In the sidecar container SUPERVISE_DB_PATH points at the
# bind-mounted host DB. On the host this env var is never set,
# so we always fall through to host_db_path().
env_path = os.environ.get("SUPERVISE_DB_PATH", "").strip()
resolved = Path(env_path) if env_path else host_db_path()
super().__init__(resolved, _MIGRATIONS)
def write_proposal(self, proposal: Proposal) -> Path: def write_proposal(self, proposal: Proposal) -> Path:
with self._connect() as conn: with self._connect() as conn: