- Fixed the call to get_committed_value() on CompositeProperty.

[ticket:1504]

diff --git a/CHANGES b/CHANGES
index 1a4c7e1cae9e45541f728552da839deb3cec6bd3..6625e0af71b63337f9bd2dcb8f960dfdceeafbbe 100644 (file)
--- 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 1ca71390c4677ae165b89e51140b782843a885a3..1fd7d48a997ab2c600e37e78d2d16bb2de12ac7b 100644 (file)
--- 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):