home
·
contact
·
privacy
projects
/
plomtask
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
23c7ff7
)
Use more meaningful variable names.
author
Christian Heller
<c.heller@plomlompom.de>
Thu, 25 Apr 2024 04:12:07 +0000
(06:12 +0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Thu, 25 Apr 2024 04:12:07 +0000
(06:12 +0200)
plomtask/db.py
patch
|
blob
|
history
diff --git
a/plomtask/db.py
b/plomtask/db.py
index bf2b79f758b313525816581620a792330fdbd9a2..634862ce6c57b94282e95ce02c7ef1d21d42c99a 100644
(file)
--- a/
plomtask/db.py
+++ b/
plomtask/db.py
@@
-112,22
+112,22
@@
class DatabaseConnection:
return '(' + ','.join(['?'] * len(values)) + ')'
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] = []
"""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
@classmethod
- def from_table_row(cls: type[
T
],
+ def from_table_row(cls: type[
BaseModelInstance
],
# pylint: disable=unused-argument
db_conn: DatabaseConnection,
# 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()
"""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,
@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_)
"""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
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():
"""Get object of id_ from class's cache, or None if not found."""
# pylint: disable=consider-iterating-dictionary
if id_ in cls.cache_.keys():