openstack
/
heat
Code Issues Proposed changes

Merge "Fix delete event error in postgres"

This commit is contained in:
Jenkins 2014-05-28 06:00:30 +00:00 committed by Gerrit Code Review
parent 6597fd350b dca6c7b666
commit 0f9e4a16ba
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -554,17 +554,10 @@ def _delete_event_rows(context, stack_id, limit):
# confirmed via integration tests.
query = _query_all_by_stack(context, stack_id)
session = _session(context)
if 'postgres' not in session.connection().dialect.name:
ids = [r.id for r in query.order_by(
models.Event.id).limit(limit).all()]
q = session.query(models.Event).filter(
models.Event.id.in_(ids))
else:
stmt = session.query(
models.Event.id).filter_by(
stack_id=stack_id).order_by(
models.Event.id).limit(limit).subquery()
q = query.join(stmt, models.Event.id == stmt.c.id)
ids = [r.id for r in query.order_by(
models.Event.id).limit(limit).all()]
q = session.query(models.Event).filter(
models.Event.id.in_(ids))
return q.delete(synchronize_session='fetch')