diff --git a/bot_bottle/cli/__init__.py b/bot_bottle/cli/__init__.py index 8b38401..a76f2df 100644 --- a/bot_bottle/cli/__init__.py +++ b/bot_bottle/cli/__init__.py @@ -76,7 +76,7 @@ def main(argv: list[str] | None = None) -> int: usage() die(f"unknown command: {command}") mgr = StoreManager.instance() - if not mgr.check_migrations(): + if not mgr.is_migrated(): sys.stderr.write("bot-bottle: database schema is out of date\n") sys.stderr.write("Migrate now? [y/N] ") sys.stderr.flush() diff --git a/bot_bottle/db_store.py b/bot_bottle/db_store.py index 3d24bc7..5d4bf37 100644 --- a/bot_bottle/db_store.py +++ b/bot_bottle/db_store.py @@ -28,7 +28,7 @@ class DbStore: conn.row_factory = sqlite3.Row return conn - def check_migrations(self) -> bool: + def is_migrated(self) -> bool: """Return True if the DB is fully up-to-date, False if migration is needed.""" if not self.db_path.exists(): return False diff --git a/bot_bottle/store_manager.py b/bot_bottle/store_manager.py index 5f2aa2f..70b1f46 100644 --- a/bot_bottle/store_manager.py +++ b/bot_bottle/store_manager.py @@ -15,7 +15,7 @@ _instance: StoreManager | None = None class StoreManager: - """Owns db_path and delegates migrate/check_migrations across all stores. + """Owns db_path and delegates migrate/is_migrated across all stores. Use instance() for normal access. Call reset(db_path) in tests to swap the singleton to a temp path, then reset() with no args to restore the @@ -46,10 +46,10 @@ class StoreManager: global _instance _instance = cls(db_path) - def check_migrations(self) -> bool: + def is_migrated(self) -> bool: return ( - QueueStore("", self.db_path).check_migrations() - and AuditStore(self.db_path).check_migrations() + QueueStore("", self.db_path).is_migrated() + and AuditStore(self.db_path).is_migrated() ) def migrate(self) -> None: diff --git a/tests/unit/test_cli_dispatch.py b/tests/unit/test_cli_dispatch.py index 34172ce..033d16a 100644 --- a/tests/unit/test_cli_dispatch.py +++ b/tests/unit/test_cli_dispatch.py @@ -20,7 +20,7 @@ from bot_bottle.store_manager import StoreManager class TestMainDispatch(unittest.TestCase): def setUp(self) -> None: - patcher = patch.object(DbStore, "check_migrations", return_value=True) + patcher = patch.object(DbStore, "is_migrated", return_value=True) self._mock_check = patcher.start() self.addCleanup(patcher.stop) self.addCleanup(StoreManager.reset)