summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-10-21 21:20:39 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-10-21 21:20:39 +0000
commit9b9bd678a7b002e01fac09ac5397d0e15bd4a96b (patch)
tree4d6fae6b2896292826a554d930a8c0b4bc05afc9
parentadc72de6a4fe2547b015ccc41c6b956137290925 (diff)
downloadsqlalchemy-9b9bd678a7b002e01fac09ac5397d0e15bd4a96b.tar.gz
- Fixed 0.4-only bug preventing composite columns
from working properly with inheriting mappers [ticket:1199]
-rw-r--r--CHANGES4
-rw-r--r--lib/sqlalchemy/orm/strategies.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 866f4e793..0c4607734 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 1255991a5..327d2ab53 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: