From: Angus Salkeld <asalkeld@redhat.com>
Date: Wed, 14 Aug 2013 06:51:21 +0000 (+1000)
Subject: Remove "lazy=joined" from the resource_data backref
X-Git-Tag: 2014.1~169^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=23e7b585a23b153e4cb5787f95377a5932ce8eec;p=openstack-build%2Fheat-build.git

Remove "lazy=joined" from the resource_data backref

This is having some weird interaction with the rsrc_metadata column.
In a later patch I add a call to resource_data_set() in signal_responder
and the metadata tests start failing.

Change-Id: Ib59972fe69570f4ae36e672987419f4841a2de40
---

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index e5c5a08b..a4e198f6 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -277,7 +277,7 @@ class Resource(BASE, HeatBase):
     stack = relationship(Stack, backref=backref('resources'))
     data = relationship(ResourceData,
                         cascade="all,delete",
-                        backref=backref('resource', lazy='joined'))
+                        backref=backref('resource'))
 
 
 class WatchRule(BASE, HeatBase):