openstack
/
glance
Code Issues Proposed changes

Merge "Don't allow queries with 'IN' predicate with an empty sequence"

This commit is contained in:
Jenkins 2015-10-14 04:48:53 +00:00 committed by Gerrit Code Review
parent f35854348a ae97de9674
commit 5b9127ad40
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glance/db/sqlalchemy/api.py
View File

@ -876,11 +876,12 @@ def _image_locations_set(context, image_id, locations, session=None):
# NOTE(zhiyan): 1. Remove records from DB for deleted locations
session = session or get_session()
query = session.query(models.ImageLocation).filter_by(
image_id=image_id).filter_by(
deleted=False).filter(~models.ImageLocation.id.in_(
[loc['id']
for loc in locations
if loc.get('id')]))
image_id=image_id).filter_by(deleted=False)
loc_ids = [loc['id'] for loc in locations if loc.get('id')]
if loc_ids:
query = query.filter(~models.ImageLocation.id.in_(loc_ids))
for loc_id in [loc_ref.id for loc_ref in query.all()]:
image_location_delete(context, image_id, loc_id, 'deleted',
session=session)