From 8158e755bcb339f78a2e8d412af0aa9f79103fe0 Mon Sep 17 00:00:00 2001 From: Joe Keen Date: Fri, 14 Aug 2015 13:22:24 -0600 Subject: [PATCH] Removing soft delete functionality Transform repository now deletes row rather than setting the deleted_at attribute. --- .../mysql/transforms_repository.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/monasca_events_api/common/repositories/mysql/transforms_repository.py b/monasca_events_api/common/repositories/mysql/transforms_repository.py index 42f15f3..204d0e4 100644 --- a/monasca_events_api/common/repositories/mysql/transforms_repository.py +++ b/monasca_events_api/common/repositories/mysql/transforms_repository.py @@ -17,8 +17,8 @@ from oslo_log import log from oslo_utils import timeutils from monasca_events_api.common.repositories.mysql import mysql_repository -from monasca_events_api.common.repositories import transforms_repository from monasca_events_api.common.repositories import constants +from monasca_events_api.common.repositories import transforms_repository LOG = log.getLogger(__name__) @@ -81,21 +81,14 @@ class TransformsRepository(mysql_repository.MySQLRepository, tenant_id_clause = " and tenant_id = \"{}\"".format(tenant_id) transform_id_clause = " and id = \"{}\"".format(transform_id) - query = (base_query+ - tenant_id_clause+ + query = (base_query + + tenant_id_clause + transform_id_clause) rows = self._execute_query(query, []) return rows def delete_transform(self, tenant_id, transform_id): - now = timeutils.utcnow() - base_query = "update event_transform set deleted_at = \"{}\" where"\ - .format(now) - tenant_id_clause = " tenant_id = \"{}\"".format(tenant_id) - transform_id_clause = " and id = \"{}\"".format(transform_id) - - query = (base_query + - tenant_id_clause + - transform_id_clause) - self._execute_query(query, []) + self._execute_query("""delete from event_transform + where tenant_id = %s and id = %s""", + [tenant_id, transform_id])