openstack
/
glance
Code Issues Proposed changes

db: Replace use of 'Query.values()' 

Resolve the following RemovedIn20Warning warnings:

  Query.values() is deprecated and will be removed in a future release.
  Please use Query.with_entities() (deprecated since: 1.4)

Change-Id: Id231036ae122c5878205fbb3d591cee53b817613
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane 2023-07-19 10:31:57 +01:00 committed by Stephen Finucane
parent 36329c0a75
commit c70349d823
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/db/sqlalchemy/metadef_api/namespace.py
View File

@ -174,8 +174,10 @@ def _get_all_by_resource_types(context, session, filters, marker=None,
session.query(models.MetadefResourceType)
.join(models.MetadefResourceType.associations)
.filter(models.MetadefResourceType.name.in_(resource_type_list))
.values(models.MetadefResourceType.name,
models.MetadefNamespaceResourceType.namespace_id)
.with_entities(
models.MetadefResourceType.name,
models.MetadefNamespaceResourceType.namespace_id,
)
)
namespace_id_list = []

13
glance/db/sqlalchemy/metadef_api/resource_type_association.py
View File

@ -139,11 +139,14 @@ def get_all_by_namespace(context, namespace_name, session):
session.query(models.MetadefResourceType)
.join(models.MetadefResourceType.associations)
.filter_by(namespace_id=namespace['id'])
.values(models.MetadefResourceType.name,
models.MetadefNamespaceResourceType.properties_target,
models.MetadefNamespaceResourceType.prefix,
models.MetadefNamespaceResourceType.created_at,
models.MetadefNamespaceResourceType.updated_at))
.with_entities(
models.MetadefResourceType.name,
models.MetadefNamespaceResourceType.properties_target,
models.MetadefNamespaceResourceType.prefix,
models.MetadefNamespaceResourceType.created_at,
models.MetadefNamespaceResourceType.updated_at,
)
)
model_dict_list = []
for name, properties_target, prefix, created_at, updated_at in db_recs:

7
glance/tests/unit/fixtures.py
View File

@ -220,13 +220,6 @@ class WarningsFixture(pyfixtures.Fixture):
message=r'The Engine.execute\(\) method is considered legacy ',
)
warnings.filterwarnings(
'ignore',
module='glance',
category=sqla_exc.SADeprecationWarning,
message=r'Query.values\(\) is deprecated ',
)
warnings.filterwarnings(
'ignore',
module='glance',