openstack
/
aodh
Code Issues Proposed changes

Merge "Fix db upgrade with SQLAlchemy 2.0"

This commit is contained in:
Zuul 2024-05-09 12:18:38 +00:00 committed by Gerrit Code Review
parent aa2eb60df4 6efa793ec2
commit 2a98c261f0
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aodh/storage/impl_sqlalchemy.py
View File

@ -156,17 +156,19 @@ class Connection(base.Connection):
def upgrade(self, nocreate=False):
cfg = self._get_alembic_config()
cfg.conf = self.conf
if nocreate:
command.upgrade(cfg, "head")
else:
engine = enginefacade.writer.get_engine()
ctxt = migration.MigrationContext.configure(engine.connect())
current_version = ctxt.get_current_revision()
if current_version is None:
models.Base.metadata.create_all(engine, checkfirst=False)
command.stamp(cfg, "head")
else:
engine = enginefacade.writer.get_engine()
with engine.connect() as conn, conn.begin():
cfg.attributes['connection'] = conn
if nocreate:
command.upgrade(cfg, "head")
else:
ctxt = migration.MigrationContext.configure(conn)
current_version = ctxt.get_current_revision()
if current_version is None:
models.Base.metadata.create_all(conn, checkfirst=False)
command.stamp(cfg, "head")
else:
command.upgrade(cfg, "head")
def clear(self):
engine = enginefacade.writer.get_engine()

17
aodh/storage/sqlalchemy/alembic/env.py
View File

@ -68,10 +68,21 @@ def run_migrations_online():
and associate a connection with the context.
"""
engine = enginefacade.writer.get_engine()
with engine.connect() as connection:
connectable = config.attributes.get('connection', None)
if connectable is None:
engine = enginefacade.writer.get_engine()
with engine.connect() as connection:
context.configure(
connection=connection,
target_metadata=target_metadata
)
with context.begin_transaction():
context.run_migrations()
else:
context.configure(
connection=connection,
connection=connectable,
target_metadata=target_metadata
)