Merge "Fix delete event error in postgres"
This commit is contained in:
commit
0f9e4a16ba
|
@ -554,17 +554,10 @@ def _delete_event_rows(context, stack_id, limit):
|
||||||
# confirmed via integration tests.
|
# confirmed via integration tests.
|
||||||
query = _query_all_by_stack(context, stack_id)
|
query = _query_all_by_stack(context, stack_id)
|
||||||
session = _session(context)
|
session = _session(context)
|
||||||
if 'postgres' not in session.connection().dialect.name:
|
ids = [r.id for r in query.order_by(
|
||||||
ids = [r.id for r in query.order_by(
|
models.Event.id).limit(limit).all()]
|
||||||
models.Event.id).limit(limit).all()]
|
q = session.query(models.Event).filter(
|
||||||
q = session.query(models.Event).filter(
|
models.Event.id.in_(ids))
|
||||||
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)
|
|
||||||
return q.delete(synchronize_session='fetch')
|
return q.delete(synchronize_session='fetch')
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue