From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 3 Nov 2009 04:58:18 +0000 (+0000)
Subject: - Fixed the call to get_committed_value() on CompositeProperty.
X-Git-Tag: rel_0_6beta1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db3521823dd629d07079555341b5f5885264650f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed the call to get_committed_value() on CompositeProperty.
[ticket:1504]
---

diff --git a/CHANGES b/CHANGES
index 1a4c7e1cae..6625e0af71 100644
--- a/CHANGES
+++ b/CHANGES
@@ -659,6 +659,9 @@ CHANGES
       duplicate extensions, such as backref populators,
       from being inserted into the list.
       [ticket:1585]
+    
+    - Fixed the call to get_committed_value() on CompositeProperty.
+      [ticket:1504]
       
 - sql
     - Fixed the "numeric" paramstyle, which apparently is the
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 1ca71390c4..1fd7d48a99 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -161,7 +161,8 @@ class CompositeProperty(ColumnProperty):
         return self.get_col_value(column, obj)
 
     def getcommitted(self, state, column, passive=False):
-        obj = state.get_impl(self.key).get_committed_value(state, passive=passive)
+        # TODO: no coverage here
+        obj = state.get_impl(self.key).get_committed_value(state, state.dict, passive=passive)
         return self.get_col_value(column, obj)
 
     def setattr(self, state, value, column):