Bugfix: Overwrite database by default

mesmo-dev · Mar 4, 2019 · 903fc9a · 903fc9a
1 parent caf2c8b
commit 903fc9a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/cobmo/main.py b/cobmo/main.py
@@ -9,10 +9,11 @@
 
 
 def connect_database(
-        data_path=os.path.join(os.path.dirname(os.path.normpath(__file__)), '..', 'data')
+        data_path=os.path.join(os.path.dirname(os.path.normpath(__file__)), '..', 'data'),
+        overwrite_database=True
 ):
     # Create database, if none
-    if not os.path.isfile(os.path.join(data_path, 'data.sqlite')):
+    if overwrite_database or not os.path.isfile(os.path.join(data_path, 'data.sqlite')):
         cobmo.utils.create_database(
             sqlite_path=os.path.join(data_path, 'data.sqlite'),
             sql_path=os.path.join(data_path, 'data.sqlite.schema.sql'),

diff --git a/cobmo/utils.py b/cobmo/utils.py
@@ -20,13 +20,19 @@ def create_database(
     """
     Create SQLITE database from SQL (schema) file and CSV files
     """
-    # Remove old SQLITE database file, if any
-    if os.path.isfile(sqlite_path):
-        os.remove(sqlite_path)
-
-    # Create SQLITE database (schema) from SQL file
+    # Connect SQLITE database (creates file, if none)
     conn = sqlite3.connect(sqlite_path)
     cursor = conn.cursor()
+
+    # Remove old data, if any
+    cursor.executescript("""
+        PRAGMA writable_schema = 1;
+        DELETE FROM sqlite_master WHERE type IN ('table', 'index', 'trigger');
+        PRAGMA writable_schema = 0;
+        VACUUM;
+        """)
+
+    # Recreate SQLITE database (schema) from SQL file
     cursor.executescript(open(sql_path, 'r').read())
     conn.commit()