From 734dce8b60320791efc85005f6a9dde116ff8898 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 15 Nov 2009 20:39:39 +0000 Subject: - Fixed bug whereby composite columns wouldn't load properly when configured on a joined-table subclass, introduced in version 0.5.6 as a result of the fix for [ticket:1480]. [ticket:1616] thx to Scott Torborg. --- lib/sqlalchemy/orm/mapper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 146c4d673..1c7c37ead 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1165,7 +1165,10 @@ class Mapper(object): cond = sql.and_(*allconds) - return sql.select([props[key].columns[0] for key in attribute_names], cond, use_labels=True) + cols = [] + for key in attribute_names: + cols.extend(props[key].columns) + return sql.select(cols, cond, use_labels=True) def cascade_iterator(self, type_, state, halt_on=None): """Iterate each element and its mapper in an object graph, -- cgit v1.2.1