Use old session management for icat_db_generator script

ral-facilities · Feb 4, 2021 · 9e8bed2 · 9e8bed2
1 parent 582817a
commit 9e8bed2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/datagateway_api/src/api_start_utils.py b/datagateway_api/src/api_start_utils.py
@@ -68,7 +68,7 @@ def create_app_infrastructure(flask_app):
 
     if backend_type == "db":
         flask_app.config["SQLALCHEMY_DATABASE_URI"] = Constants.DATABASE_URL
-        flask_app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
+        flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
         db.init_app(flask_app)
 
     initialise_spec(spec)

diff --git a/util/icat_db_generator.py b/util/icat_db_generator.py
@@ -5,9 +5,12 @@
 from random import choice, randrange, seed
 
 from faker import Faker
+from sqlalchemy import create_engine
+from sqlalchemy.orm import scoped_session, sessionmaker
+from sqlalchemy.pool import QueuePool
 
+from datagateway_api.common.constants import Constants
 from datagateway_api.common.database import models
-from datagateway_api.common.database.helpers import db
 
 parser = argparse.ArgumentParser()
 parser.add_argument(
@@ -33,7 +36,12 @@
 faker.seed(SEED)
 seed(a=SEED)
 
-session = db.session
+
+engine = create_engine(
+    Constants.DATABASE_URL, poolclass=QueuePool, pool_size=100, max_overflow=0,
+)
+session_factory = sessionmaker(engine)
+session = scoped_session(session_factory)()
 
 
 def post_entity(entity):