From: Jason Dunsmore <jasondunsmore@gmail.com>
Date: Tue, 16 Jul 2013 21:13:24 +0000 (-0500)
Subject: Fix resource-data delete bug.
X-Git-Tag: 2014.1~361^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=319d3e158f0d92c0f3d1e20095db8db6f056365c;p=openstack-build%2Fheat-build.git

Fix resource-data delete bug.

Bug 1201974.

Change-Id: I6c4692df71dc7188c0a9caf0ca6c26b67b4e168f
---

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 6ee060fb..2928b914 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -252,8 +252,9 @@ class Resource(BASE, HeatBase):
                                  sqlalchemy.ForeignKey('stack.id'),
                                  nullable=False)
     stack = relationship(Stack, backref=backref('resources'))
-    data = relationship(ResourceData, backref=backref('resources',
-                                                      lazy='joined'))
+    data = relationship(ResourceData,
+                        cascade="all,delete",
+                        backref=backref('resource', lazy='joined'))
 
 
 class WatchRule(BASE, HeatBase):