From 319d3e158f0d92c0f3d1e20095db8db6f056365c Mon Sep 17 00:00:00 2001 From: Jason Dunsmore Date: Tue, 16 Jul 2013 16:13:24 -0500 Subject: [PATCH] Fix resource-data delete bug. Bug 1201974. Change-Id: I6c4692df71dc7188c0a9caf0ca6c26b67b4e168f --- heat/db/sqlalchemy/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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): -- 2.45.2