X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/todo?a=blobdiff_plain;f=plomtask%2Fdb.py;h=2d9ae2714ca9a2e625036ea44f295880db986f16;hb=7eb81e526c45118a295dbfc12be01f92dc809974;hp=bf2b79f758b313525816581620a792330fdbd9a2;hpb=23c7ff7f9833ff5b0e547c19a4ad85325a5d3400;p=plomtask

diff --git a/plomtask/db.py b/plomtask/db.py
index bf2b79f..2d9ae27 100644
--- a/plomtask/db.py
+++ b/plomtask/db.py
@@ -112,22 +112,22 @@ class DatabaseConnection:
         return '(' + ','.join(['?'] * len(values)) + ')'
 
 
-X = TypeVar('X', int, str)
-T = TypeVar('T', bound='BaseModel[Any]')
+BaseModelId = TypeVar('BaseModelId', int, str)
+BaseModelInstance = TypeVar('BaseModelInstance', bound='BaseModel[Any]')
 
 
-class BaseModel(Generic[X]):
+class BaseModel(Generic[BaseModelId]):
     """Template for most of the models we use/derive from the DB."""
     table_name = ''
     to_save: list[str] = []
-    id_: None | X
-    cache_: dict[X, Self] = {}
+    id_: None | BaseModelId
+    cache_: dict[BaseModelId, Self] = {}
 
     @classmethod
-    def from_table_row(cls: type[T],
+    def from_table_row(cls: type[BaseModelInstance],
                        # pylint: disable=unused-argument
                        db_conn: DatabaseConnection,
-                       row: Row | list[Any]) -> T:
+                       row: Row | list[Any]) -> BaseModelInstance:
         """Make from DB row, write to DB cache."""
         obj = cls(*row)
         obj.cache()
@@ -136,7 +136,7 @@ class BaseModel(Generic[X]):
     @classmethod
     def _by_id(cls,
                db_conn: DatabaseConnection,
-               id_: X) -> tuple[Self | None, bool]:
+               id_: BaseModelId) -> tuple[Self | None, bool]:
         """Return instance found by ID, or None, and if from cache or not."""
         from_cache = False
         obj = cls.get_cached(id_)
@@ -170,7 +170,8 @@ class BaseModel(Generic[X]):
         self.cache()
 
     @classmethod
-    def get_cached(cls: type[T], id_: X) -> T | None:
+    def get_cached(cls: type[BaseModelInstance],
+                   id_: BaseModelId) -> BaseModelInstance | None:
         """Get object of id_ from class's cache, or None if not found."""
         # pylint: disable=consider-iterating-dictionary
         if id_ in cls.cache_.keys():
@@ -195,3 +196,19 @@ class BaseModel(Generic[X]):
     def empty_cache(cls) -> None:
         """Empty class's cache."""
         cls.cache_ = {}
+
+    @classmethod
+    def all(cls: type[BaseModelInstance],
+            db_conn: DatabaseConnection) -> list[BaseModelInstance]:
+        """Collect all objects of class."""
+        items: dict[BaseModelId, BaseModelInstance] = {}
+        for k, v in cls.cache_.items():
+            assert isinstance(v, cls)
+            items[k] = v
+        already_recorded = items.keys()
+        for id_ in db_conn.column_all(cls.table_name, 'id'):
+            if id_ not in already_recorded:
+                # pylint: disable=no-member
+                item = cls.by_id(db_conn, id_)  # type: ignore[attr-defined]
+                items[item.id_] = item
+        return list(items.values())