Make cleaning up temporary databases more reliable (#770)

Summary:
Pull Request resolved: #770

Temporary databases now more cleanly delete themselves even if connection has already been cleaned up.

Reviewed By: adellari

Differential Revision: D72811319

fbshipit-source-id: 0a81098387e67f64ff704eb15ef35a7d27957cbc

Author: JasonKChow

aepsych/database/db.py

@@ -99,11 +99,13 @@ def get_engine(self) -> sessionmaker:
 
     def delete_db(self) -> None:
         """Delete the database."""
-        if self._engine is not None and self._full_db_path.exists():
+        if self._engine is not None:
             close_all_sessions()
-            self._full_db_path.unlink()
             self._engine = None
 
+        if self._full_db_path.exists():
+            self._full_db_path.unlink()
+
         if self._temp_dir is not None:
             self._temp_dir.cleanup()
 

aepsych/database/utils.py

@@ -79,6 +79,7 @@ def combine_dbs(
         for master in db.get_master_records():
             transfer_dbs(out_db, master, extra_metadata={"origin_db": str(db_path)})
 
+        db.cleanup()
         num_experiments += 1
 
     return num_experiments