Implemented open connection at each transaction
Also adds vacation and backups table.
This commit is contained in:
parent
0898143f68
commit
1c2c64f9fe
@ -22,6 +22,20 @@ CREATE TABLE IF NOT EXISTS transactions (
|
||||
);
|
||||
"""
|
||||
|
||||
CREATE_VACATIONS_TABLE = """
|
||||
CREATE TABLE IF NOT EXISTS vacations (
|
||||
start TEXT NOT NULL,
|
||||
end TEXT NOT NULL
|
||||
)
|
||||
"""
|
||||
|
||||
CREATE_BACKUPS_TABLE = """
|
||||
CREATE TABLE IF NOT EXISTS backups (
|
||||
datetime TEXT NOT NULL,
|
||||
file TEXT NOT NULL
|
||||
)
|
||||
"""
|
||||
|
||||
CREATE_BANKS_TABLE = """
|
||||
CREATE TABLE banks (
|
||||
name TEXT NOT NULL PRIMARY KEY,
|
||||
@ -70,56 +84,56 @@ FROM transactions
|
||||
"""
|
||||
|
||||
|
||||
class Connection:
|
||||
class DBManager:
|
||||
"""SQLite DB connection manager"""
|
||||
|
||||
def __init__(self, db_name):
|
||||
self.db_name = db_name
|
||||
self.connection = None
|
||||
def __init__(self, db):
|
||||
self.db = db
|
||||
|
||||
self.__open()
|
||||
self.__create_tables((("transactions", CREATE_TRANSACTIONS_TABLE),))
|
||||
|
||||
def __open(self):
|
||||
try:
|
||||
self.connection = sqlite3.connect(self.db_name)
|
||||
logger.debug(f"SQLite database {self.db_name} connection successful")
|
||||
except sqlite3.Error:
|
||||
logger.exception(f"Error while connection to {self.db_name}")
|
||||
|
||||
def close(self):
|
||||
try:
|
||||
self.connection.close()
|
||||
logger.debug(f"SQLite database {self.db_name} closed")
|
||||
except sqlite3.Error:
|
||||
logger.exception(f"Error while closing {self.db_name} database")
|
||||
self.__create_tables(
|
||||
(
|
||||
("transactions", CREATE_TRANSACTIONS_TABLE),
|
||||
("vacations", CREATE_VACATIONS_TABLE),
|
||||
("backups", CREATE_BACKUPS_TABLE),
|
||||
)
|
||||
)
|
||||
|
||||
def __execute(self, query, params=None):
|
||||
ret = None
|
||||
try:
|
||||
with self.connection:
|
||||
con = sqlite3.connect(self.db)
|
||||
with con:
|
||||
if params:
|
||||
cur = self.connection.execute(query, params)
|
||||
logger.debug(f"[{self.db_name}] < {query}{params}")
|
||||
ret = con.execute(query, params).fetchall()
|
||||
logger.debug(f"[{self.db}] < {query}{params}")
|
||||
else:
|
||||
cur = self.connection.execute(query)
|
||||
logger.debug(f"[{self.db_name}] < {query}")
|
||||
ret = con.execute(query).fetchall()
|
||||
logger.debug(f"[{self.db}] < {query}")
|
||||
|
||||
if ret := cur.fetchall():
|
||||
logger.debug(f"[{self.db_name}] > {ret}")
|
||||
return ret
|
||||
if ret:
|
||||
logger.debug(f"[{self.db}] > {ret}")
|
||||
except sqlite3.Error:
|
||||
logger.exception(f"Error while executing [{self.db_name}] < {query}")
|
||||
logger.exception(f"Error while executing [{self.db}] < {query}")
|
||||
finally:
|
||||
con.close()
|
||||
|
||||
return ret
|
||||
|
||||
def __executemany(self, query, list_of_params):
|
||||
ret = None
|
||||
try:
|
||||
with self.connection:
|
||||
cur = self.connection.executemany(query, list_of_params)
|
||||
logger.debug(f"[{self.db_name}] < {query}{list_of_params}")
|
||||
return cur.fetchall()
|
||||
con = sqlite3.connect(self.db)
|
||||
with con:
|
||||
ret = con.executemany(query, list_of_params).fetchall()
|
||||
logger.debug(f"[{self.db}] < {query}{list_of_params}")
|
||||
except sqlite3.Error:
|
||||
logger.exception(
|
||||
f"Error while executing [{self.db_name}] < {query} {list_of_params}"
|
||||
f"Error while executing [{self.db}] < {query} {list_of_params}"
|
||||
)
|
||||
finally:
|
||||
con.close()
|
||||
|
||||
return ret
|
||||
|
||||
def __create_tables(self, tables):
|
||||
for table_name, query in tables:
|
||||
@ -127,15 +141,15 @@ class Connection:
|
||||
self.__execute(query)
|
||||
|
||||
def select_all(self):
|
||||
logger.info(f"Reading all transactions from {self.db_name}")
|
||||
logger.info(f"Reading all transactions from {self.db}")
|
||||
return self.__execute("SELECT * FROM transactions")
|
||||
|
||||
def add_transaction(self, transaction):
|
||||
logger.info(f"Adding {transaction} into {self.db_name}")
|
||||
logger.info(f"Adding {transaction} into {self.db}")
|
||||
self.__execute(ADD_TRANSACTION, transaction)
|
||||
|
||||
def add_transactions(self, transactions):
|
||||
logger.info(f"Adding {len(transactions)} into {self.db_name}")
|
||||
logger.info(f"Adding {len(transactions)} into {self.db}")
|
||||
self.__executemany(ADD_TRANSACTION, transactions)
|
||||
|
||||
def update_category(self, transaction):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user