diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-24 09:08:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-24 09:08:00 +0000 |
| commit | a7ac8f00a27fee74ac704958eb0872d3afee37e6 (patch) | |
| tree | 09a1b61785195e78b5ea0122b79bc43d507cdd14 | |
| parent | e397629c957dcd268c95fe06f8bc4cd9c87980bc (diff) | |
| parent | af5ffbe0197e15b3aa7b365e16c453d3d8c847a7 (diff) | |
| download | heat-a7ac8f00a27fee74ac704958eb0872d3afee37e6.tar.gz | |
Merge "Replace deprecated Query.as_scalar()"
| -rw-r--r-- | heat/db/sqlalchemy/api.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py index 7ca61a756..df627d43c 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -544,7 +544,7 @@ def resource_get_all_active_by_stack(context, stack_id): results = context.session.query(models.Resource).filter_by( stack_id=stack_id).filter( - models.Resource.id.notin_(subquery.as_scalar()) + models.Resource.id.notin_(subquery.scalar_subquery()) ).options(orm.joinedload("data")).all() return dict((res.id, res) for res in results) diff --git a/requirements.txt b/requirements.txt index 457724754..f891741e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -65,7 +65,7 @@ PyYAML>=5.1 # MIT requests>=2.23.0 # Apache-2.0 tenacity>=6.1.0 # Apache-2.0 Routes>=2.3.1 # MIT -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +SQLAlchemy>=1.4.0 # MIT sqlalchemy-migrate>=0.13.0 # Apache-2.0 stevedore>=3.1.0 # Apache-2.0 WebOb>=1.7.1 # MIT |