From: Steven Hardy <shardy@redhat.com>
Date: Fri, 20 Jul 2012 10:17:08 +0000 (+0100)
Subject: heat db : fix per-object delete
X-Git-Tag: 2014.1~1577^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=912a4fc7a706bdf08ee731e0430256a326ca9d34;p=openstack-build%2Fheat-build.git

heat db : fix per-object delete

Fixes problem where per-resource destroy() operations do not
delete the underlying database row because the model delete
method is broken

Change-Id: I3562c9048f8d4e54c1ea51090e74abe982ffb330
Signed-off-by: Steven Hardy <shardy@redhat.com>
---

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index c92bf131..63ec8ad9 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -81,7 +81,12 @@ class HeatBase(object):
         """Delete this object."""
         self.deleted = True
         self.deleted_at = timeutils.utcnow()
-        self.save(session=session)
+        if not session:
+            session = Session.object_session(self)
+            if not session:
+                session = get_session()
+        session.delete(self)
+        session.flush()
 
     def __setitem__(self, key, value):
         setattr(self, key, value)