From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 21 Oct 2008 21:20:39 +0000 (+0000)
Subject: - Fixed 0.4-only bug preventing composite columns
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b9bd678a7b002e01fac09ac5397d0e15bd4a96b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed 0.4-only bug preventing composite columns
from working properly with inheriting mappers
[ticket:1199]
---

diff --git a/CHANGES b/CHANGES
index 866f4e7937..0c46077342 100644
--- 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 1255991a5f..327d2ab53c 100644
--- 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: