openstack
/
oslo.db
Code Issues Proposed changes

Merge "Resolve SAWarning in Query.soft_delete()"

This commit is contained in:
Zuul 2019-02-13 11:48:46 +00:00 committed by Gerrit Code Review
parent ae227eb3b9 af4b2263e4
commit 5895d04fd8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_db/sqlalchemy/orm.py
View File

@ -18,7 +18,6 @@
from oslo_utils import timeutils
import sqlalchemy.orm
from sqlalchemy.sql.expression import literal_column
from oslo_db.sqlalchemy import update_match
@ -26,8 +25,9 @@ from oslo_db.sqlalchemy import update_match
class Query(sqlalchemy.orm.query.Query):
"""Subclass of sqlalchemy.query with soft_delete() method."""
def soft_delete(self, synchronize_session='evaluate'):
return self.update({'deleted': literal_column('id'),
'updated_at': literal_column('updated_at'),
entity = self.column_descriptions[0]['entity']
return self.update({'deleted': entity.id,
'updated_at': entity.updated_at,
'deleted_at': timeutils.utcnow()},
synchronize_session=synchronize_session)