home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Conditions for Todos/Processes to be met or undone by other Todos.
[plomtask]
/
plomtask
/
db.py
diff --git
a/plomtask/db.py
b/plomtask/db.py
index 50eb737cbfa3924eb3f393dd5440ed08fce0b8d9..4a82132ff9e89d990c5d3f04f1b4f7395bfb0fda 100644
(file)
--- a/
plomtask/db.py
+++ b/
plomtask/db.py
@@
-1,33
+1,34
@@
"""Database management."""
from os.path import isfile
from difflib import Differ
"""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'
PATH_DB_SCHEMA = 'scripts/init.sql'
-class DatabaseFile:
+class DatabaseFile:
# pylint: disable=too-few-public-methods
"""Represents the sqlite3 database's file."""
"""Represents the sqlite3 database's file."""
- def __init__(self, path
)
:
+ def __init__(self, path
: str) -> None
:
self.path = path
self.path = path
- self.check()
+ self.
_
check()
- def check(self):
- """Check file exists and is of proper schema."""
- self.exists = isfile(self.path)
- if self.exists:
- self.validate_schema()
-
- 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())
"""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()
+ self._check()
+
+ 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'
"""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:
class DatabaseConnection:
"""A single connection to the database."""
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.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()
"""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)
"""Add commands to SQL transaction."""
return self.conn.execute(code, inputs)
- def close(self):
+ def close(self)
-> None
:
"""Close DB connection."""
self.conn.close()
"""Close DB connection."""
self.conn.close()