- Fixed 0.4-only bug preventing composite columns

from working properly with inheriting mappers
[ticket:1199]

diff --git a/CHANGES b/CHANGES
index 866f4e7937e46454fac2334da98bae32943e9c9c..0c460773428a1f189e799d706a9b3c0037257467 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@ CHANGES
     - polymorphic_union() function respects the "key" of each 
       Column if they differ from the column's name.
 
+    - Fixed 0.4-only bug preventing composite columns
+      from working properly with inheriting mappers
+      [ticket:1199]
+      
 0.4.8
 =====
 - orm

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 1255991a5fa5e1bf445dd27a4f572437d5800ca3..327d2ab53c1533fb286ed8e92bf5a95a05f92d9d 100644 (file)
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -62,7 +62,7 @@ class ColumnLoader(LoaderStrategy):
         if self.is_composite:
             for c in self.columns:
                 if c not in row:
-                    break
+                    return (None, None, None)
             else:
                 def new_execute(instance, row, **flags):
                     if self._should_log_debug: