openstack/heat
Code Issues Proposed changes

Merge "Replace deprecated Query.as_scalar()"

Browse Source
This commit is contained in:
Zuul 2023-01-24 09:08:00 +00:00 committed by Gerrit Code Review
commit a7ac8f00a2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/db/sqlalchemy/api.py
View File

@ -544,7 +544,7 @@ def resource_get_all_active_by_stack(context, stack_id):
results = context.session.query(models.Resource).filter_by( results = context.session.query(models.Resource).filter_by(
stack_id=stack_id).filter( stack_id=stack_id).filter(
models.Resource.id.notin_(subquery.as_scalar()) models.Resource.id.notin_(subquery.scalar_subquery())
).options(orm.joinedload("data")).all() ).options(orm.joinedload("data")).all()
return dict((res.id, res) for res in results) return dict((res.id, res) for res in results)

2
requirements.txt
View File

@ -65,7 +65,7 @@ PyYAML>=5.1 # MIT
requests>=2.23.0 # Apache-2.0 requests>=2.23.0 # Apache-2.0
tenacity>=6.1.0 # Apache-2.0 tenacity>=6.1.0 # Apache-2.0
Routes>=2.3.1 # MIT 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 sqlalchemy-migrate>=0.13.0 # Apache-2.0
stevedore>=3.1.0 # Apache-2.0 stevedore>=3.1.0 # Apache-2.0
WebOb>=1.7.1 # MIT WebOb>=1.7.1 # MIT