From c5b60f22dad3da89acc1d25ae2b52b7fa738d9da Mon Sep 17 00:00:00 2001 From: Luke Else Date: Sat, 24 Feb 2024 08:47:57 +0000 Subject: [PATCH] #11 Added defaults to every fetch of 'ENVIRON' to ensure a value is available --- controllers/database/database.py | 2 +- scripts/create_database.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/database/database.py b/controllers/database/database.py index f133281..c71001e 100644 --- a/controllers/database/database.py +++ b/controllers/database/database.py @@ -12,7 +12,7 @@ class DatabaseController(ABC): __db_name = "wmgzon.db" # Use test file if necessary - if os.environ.get("ENVIRON") == "test": + if os.environ.get("ENVIRON", "test") == "test": __db_name = "test_" + __db_name __sqlitefile = __data_dir + __db_name diff --git a/scripts/create_database.py b/scripts/create_database.py index 31cfd0c..c5e8f30 100644 --- a/scripts/create_database.py +++ b/scripts/create_database.py @@ -26,7 +26,7 @@ def create_connection(path: str, filename: str): print("Table creation complete") # Populate with test data if we are in Test Mode - if os.environ.get("ENVIRON") == "test": + if os.environ.get("ENVIRON", "test") == "test": sql = open("scripts/test_data.sql", "r") conn.executescript(sql.read()) @@ -43,7 +43,7 @@ def run(): db_name = r"wmgzon.db" # Check for test environ - if os.environ.get("ENVIRON") == "test": + if os.environ.get("ENVIRON", "test") == "test": # Remove the original test database print("TEST ENVIRONMENT ACTIVE") db_name = "test_" + db_name