Defer truncate_tables commit in the local-dir CBS import path.

Author: tkalir

anyway/parsers/cbs/executor.py

@@ -1118,7 +1118,7 @@ def _import_from_local_dir(batch_size):
     dir_list = glob.glob("{0}/*/*".format(dir_name))
 
     if import_ui.is_delete_all():
-        truncate_tables(db, (Vehicle, Involved, AccidentMarker))
+        truncate_tables(db, (Vehicle, Involved, AccidentMarker), commit=False)
 
     total = 0
     for directory in sorted(dir_list, reverse=False):

anyway/utilities.py

@@ -207,11 +207,12 @@ def fetch_first_and_every_nth_value_for_column(conn, column_to_fetch, n):
     return ids
 
 
-def truncate_tables(db, tables):
+def truncate_tables(db, tables, commit=True):
     logging.info("Deleting tables: " + ", ".join(table.__name__ for table in tables))
     for table in tables:
         db.session.query(table).delete()
-        db.session.commit()
+        if commit:
+            db.session.commit()
 
 
 def delete_all_rows_from_table(conn, table):