X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomtask%2Fdb.py;h=4a82132ff9e89d990c5d3f04f1b4f7395bfb0fda;hb=34741b65438149b4e02f1e2bb4f8fdba5df5a667;hp=d6966e62f5a974e7fd6f5156988cfe2b8fbf57dc;hpb=9e32ae00d4435932d55695be4e757ff109c76f26;p=plomtask

diff --git a/plomtask/db.py b/plomtask/db.py
index d6966e6..4a82132 100644
--- a/plomtask/db.py
+++ b/plomtask/db.py
@@ -1,8 +1,9 @@
 """Database management."""
 from os.path import isfile
 from difflib import Differ
-from sqlite3 import connect as sql_connect
-from plomtask.misc import HandledException
+from sqlite3 import connect as sql_connect, Cursor
+from typing import Any, Dict
+from plomtask.exceptions import HandledException
 
 PATH_DB_SCHEMA = 'scripts/init.sql'
 
@@ -10,24 +11,24 @@ PATH_DB_SCHEMA = 'scripts/init.sql'
 class DatabaseFile:  # pylint: disable=too-few-public-methods
     """Represents the sqlite3 database's file."""
 
-    def __init__(self, path):
+    def __init__(self, path: str) -> None:
         self.path = path
         self._check()
 
-    def remake(self):
+    def remake(self) -> None:
         """Create tables in self.path file as per PATH_DB_SCHEMA sql file."""
         with sql_connect(self.path) as conn:
             with open(PATH_DB_SCHEMA, 'r', encoding='utf-8') as f:
                 conn.executescript(f.read())
         self._check()
 
-    def _check(self):
+    def _check(self) -> None:
         """Check file exists and is of proper schema."""
         self.exists = isfile(self.path)
         if self.exists:
             self._validate_schema()
 
-    def _validate_schema(self):
+    def _validate_schema(self) -> None:
         """Compare found schema with what's stored at PATH_DB_SCHEMA."""
         sql_for_schema = 'SELECT sql FROM sqlite_master ORDER BY sql'
         msg_err = 'Database has wrong tables schema. Diff:\n'
@@ -45,18 +46,23 @@ class DatabaseFile:  # pylint: disable=too-few-public-methods
 class DatabaseConnection:
     """A single connection to the database."""
 
-    def __init__(self, db_file: DatabaseFile):
+    def __init__(self, db_file: DatabaseFile) -> None:
         self.file = db_file
         self.conn = sql_connect(self.file.path)
+        self.cached_todos: Dict[int, Any] = {}
+        self.cached_days: Dict[str, Any] = {}
+        self.cached_process_steps: Dict[int, Any] = {}
+        self.cached_processes: Dict[int, Any] = {}
+        self.cached_conditions: Dict[int, Any] = {}
 
-    def commit(self):
+    def commit(self) -> None:
         """Commit SQL transaction."""
         self.conn.commit()
 
-    def exec(self, code: str, inputs: tuple = ()):
+    def exec(self, code: str, inputs: tuple[Any, ...] = tuple()) -> Cursor:
         """Add commands to SQL transaction."""
         return self.conn.execute(code, inputs)
 
-    def close(self):
+    def close(self) -> None:
         """Close DB connection."""
         self.conn.close()