From af5ffbe0197e15b3aa7b365e16c453d3d8c847a7 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Fri, 25 Jun 2021 10:34:16 +0530
Subject: [PATCH] Replace deprecated Query.as_scalar()

This has been deprecated since SQLAlchemy 1.4.

Change-Id: Id3edcc188bb44d9752fe1bd7625308c5abed4d9c
---
 heat/db/sqlalchemy/api.py | 2 +-
 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 619ca7cc24..4b719d8de7 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -537,7 +537,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 457724754b..f891741e46 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