Use the future flag on sessionmaker

ucam-department-of-psychiatry · Jan 31, 2025 · 0f2cf23 · 0f2cf23
1 parent 7477c26
commit 0f2cf23
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/server/camcops_server/cc_modules/cc_anon.py b/server/camcops_server/cc_modules/cc_anon.py
@@ -89,7 +89,7 @@ def _gen_columns_for_anon_staging_db(
     """
     url = SQLITE_MEMORY_URL
     engine = create_engine(url, echo=False, future=True)
-    session = sessionmaker(bind=engine)()  # type: SqlASession
+    session = sessionmaker(bind=engine)(future=True)  # type: SqlASession
     export_options = TaskExportOptions(
         include_blobs=recipient.db_include_blobs,
         db_patient_id_per_row=recipient.db_patient_id_per_row,

diff --git a/server/camcops_server/cc_modules/cc_config.py b/server/camcops_server/cc_modules/cc_config.py
@@ -1793,7 +1793,7 @@ def get_dbsession_raw(self) -> SqlASession:
         """
         engine = self.get_sqla_engine()
         maker = sessionmaker(bind=engine)
-        dbsession = maker()  # type: SqlASession
+        dbsession = maker(future=True)  # type: SqlASession
         return dbsession
 
     @contextlib.contextmanager

diff --git a/server/camcops_server/cc_modules/cc_dummy_database.py b/server/camcops_server/cc_modules/cc_dummy_database.py
@@ -234,7 +234,9 @@ class DummyDataFactory(DummyDataInserter):
     def __init__(self, cfg: "CamcopsConfig") -> None:
         super().__init__()
         engine = cfg.get_sqla_engine()
-        self.dbsession = sessionmaker()(bind=engine)  # type: SqlASession
+        self.dbsession = sessionmaker()(
+            bind=engine, future=True
+        )  # type: SqlASession
 
         self.era_time = pendulum.now()
         self.era_time_utc = convert_datetime_to_utc(self.era_time)

diff --git a/server/camcops_server/cc_modules/cc_export.py b/server/camcops_server/cc_modules/cc_export.py
@@ -402,7 +402,9 @@ def export_whole_database(
                 "Exporting to database: {}",
                 get_safe_url_from_engine(dst_engine),
             )
-            dst_session = sessionmaker(bind=dst_engine)()  # type: SqlASession
+            dst_session = sessionmaker(bind=dst_engine)(
+                future=True
+            )  # type: SqlASession
             task_generator = gen_tasks_having_exportedtasks(collection)
             export_options = TaskExportOptions(
                 include_blobs=recipient.db_include_blobs,
@@ -1209,7 +1211,9 @@ def get_sqlite_data(self, as_text: bool) -> Union[bytes, str]:
             # ---------------------------------------------------------------------
             url = "sqlite:///" + db_filename
             engine = create_engine(url, echo=False, future=True)
-            dst_session = sessionmaker(bind=engine)()  # type: SqlASession
+            dst_session = sessionmaker(bind=engine)(
+                future=True
+            )  # type: SqlASession
             # ---------------------------------------------------------------------
             # Iterate through tasks, creating tables as we need them.
             # ---------------------------------------------------------------------

diff --git a/server/camcops_server/cc_modules/cc_request.py b/server/camcops_server/cc_modules/cc_request.py
@@ -486,7 +486,7 @@ def get_bare_dbsession(self) -> SqlASession:
             log.debug("Making SQLAlchemy session")
         engine = self.engine
         maker = sessionmaker(bind=engine)
-        session = maker()  # type: SqlASession
+        session = maker(future=True)  # type: SqlASession
         return session
 
     # -------------------------------------------------------------------------

diff --git a/server/playing/pyramid_test.py b/server/playing/pyramid_test.py
@@ -782,7 +782,7 @@ def session_context():
     cfg = get_config()  # type: DummyConfig
     engine = cfg.create_engine()
     maker = sessionmaker(bind=engine)
-    dbsession = maker()  # type: SqlASession
+    dbsession = maker(future=True)  # type: SqlASession
     # noinspection PyUnusedLocal,PyBroadException
     try:
         yield dbsession