From d544698fae220549f68afa218dd252366fe90b27 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 28 Feb 2024 14:21:01 +0000 Subject: [PATCH] Remove use of autocommit Change-Id: I6e973935edf5e754ba054e724b6963b6d5fd795a --- magnum/db/sqlalchemy/api.py | 4 +--- magnum/db/sqlalchemy/models.py | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/magnum/db/sqlalchemy/api.py b/magnum/db/sqlalchemy/api.py index f6f30877f6..0ec438063d 100644 --- a/magnum/db/sqlalchemy/api.py +++ b/magnum/db/sqlalchemy/api.py @@ -47,9 +47,7 @@ _FACADE = None def _create_facade_lazily(): global _FACADE if _FACADE is None: - # FIXME(karolinku): autocommit=True it's not compatible with - # SQLAlchemy 2.0, and will be removed in future - _FACADE = db_session.EngineFacade.from_config(CONF, autocommit=True) + _FACADE = db_session.EngineFacade.from_config(CONF) if profiler_sqlalchemy: if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy: profiler_sqlalchemy.add_tracing(sa, _FACADE.get_engine(), "db") diff --git a/magnum/db/sqlalchemy/models.py b/magnum/db/sqlalchemy/models.py index 0b7ae94189..92b474da37 100644 --- a/magnum/db/sqlalchemy/models.py +++ b/magnum/db/sqlalchemy/models.py @@ -93,7 +93,8 @@ class MagnumBase(models.TimestampMixin, if session is None: session = db_api.get_session() - super(MagnumBase, self).save(session) + with session.begin(): + super(MagnumBase, self).save(session) Base = declarative_base(cls=MagnumBase)