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

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

diff --git a/CHANGES b/CHANGES
index 9e79d063b9..1fda8a31d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,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 3453342a87..e874e37471 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -163,7 +163,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):