- Fixed the call to get_committed_value() on CompositeProperty.

[ticket:1504]

diff --git a/CHANGES b/CHANGES
index 9e79d063b909fdfa4baa16f1a1683a1edfe493bc..1fda8a31d37270c73d5c64b568048ede2d209404 100644 (file)
--- 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 3453342a87cd9d524a3eb912c4d6910cdbf0fe85..e874e37471b18ec85304d4b016766d4d3166505d 100644 (file)
--- 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):