From 4e6121d9bc5880d7fac3df579b5783a994cb4e4c Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 15 Apr 2024 03:30:33 -0400 Subject: [PATCH] Fix migration scripts with SQLAlchemy 2.0 select no longer accepts list/tuple as first argument but it takes multiple arguments [0] [0] https://docs.sqlalchemy.org/en/14/changelog/migration_20.html#select-no-longer-accepts-varied-constructor-arguments-columns-are-passed-positionally Closes-Bug: #2061348 Change-Id: I271986146f485b2cd4ae3391d1a27f4a57f97560 --- .../alembic_migrations/versions/29ff921a6eb_shared_pools.py | 4 ++-- .../versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py b/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py index c8a7f2a9a7..aa7dac982e 100644 --- a/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py +++ b/octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py @@ -54,8 +54,8 @@ def upgrade(): sa.ForeignKey('load_balancer.id'), nullable=True)) # Populate this new column appropriately - select_obj = sa.select([listener.c.load_balancer_id, - listener.c.default_pool_id]).where( + select_obj = sa.select(listener.c.load_balancer_id, + listener.c.default_pool_id).where( listener.c.default_pool_id is not None) result = conn.execute(select_obj) for row in result: diff --git a/octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py b/octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py index ed6277576d..a117cd3d4c 100644 --- a/octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py +++ b/octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py @@ -43,7 +43,7 @@ def migrate_pools(): j = pool_table.join(lb_table, pool_table.c.load_balancer_id == lb_table.c.id) - stmt = sa.select([pool_table.c.id]).select_from(j).where( + stmt = sa.select(pool_table.c.id).select_from(j).where( lb_table.c.provider == 'ovn') result = conn.execute(stmt)