diff options
author | Zuul <zuul@review.openstack.org> | 2019-02-13 11:48:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-02-13 11:48:46 +0000 |
commit | 5895d04fd81f6771363f108cd32790f845453dbd (patch) | |
tree | 9ed6edba6ef89a481109d05972ff064b6620a41e /oslo_db | |
parent | ae227eb3b9adb430cf6aa5a4f46f846e964fff91 (diff) | |
parent | af4b2263e4852de2bd4e66848a18be4d2282bacc (diff) | |
download | oslo-db-5895d04fd81f6771363f108cd32790f845453dbd.tar.gz |
Merge "Resolve SAWarning in Query.soft_delete()"4.44.0
Diffstat (limited to 'oslo_db')
-rw-r--r-- | oslo_db/sqlalchemy/orm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oslo_db/sqlalchemy/orm.py b/oslo_db/sqlalchemy/orm.py index decd8c8..b1ca00a 100644 --- a/oslo_db/sqlalchemy/orm.py +++ b/oslo_db/sqlalchemy/orm.py @@ -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) |