From 7daa2578a51cad61fed8e645d9e5158d5c5f5c17 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 18 Jul 2023 01:30:02 +0000 Subject: [PATCH] Fix a sqlalchemy 2.x compatibility issue A recent patch[1] introduced an incompatibility with sqlalchemy 2.x. Unfortunately the upper-constraint of oslo.db < 13.0.0 blocks us from properly testing with sqlalchemy 2.x, so this issue was not caught. [1] https://review.opendev.org/c/openstack/designate/+/880514 Change-Id: Ibc0569235997ea1feb2341adc1e942ecb3fc6dcb --- designate/storage/sqlalchemy/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designate/storage/sqlalchemy/base.py b/designate/storage/sqlalchemy/base.py index 8f948732b..b6aafdb59 100644 --- a/designate/storage/sqlalchemy/base.py +++ b/designate/storage/sqlalchemy/base.py @@ -429,7 +429,7 @@ class SQLAlchemy(object, metaclass=abc.ABCMeta): tables.records.c.recordset_id == tables.recordsets.c.id ) - query = select(RECORDSET_QUERY_TABLES).select_from(rjoin) + query = select(*RECORDSET_QUERY_TABLES).select_from(rjoin) query = query.where( tables.recordsets.c.id.in_(formatted_ids)