From 025b5283c6d511c08751e845d791ed451c9c8e7d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 23 Oct 2006 21:25:01 +0000 Subject: [PATCH] expired instances will get mapper extension's populate_instance behavior when reloaded, if present --- lib/sqlalchemy/orm/mapper.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 1327644b2b..812619499f 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1134,8 +1134,8 @@ class Mapper(object): if populate_existing or context.session.is_expired(instance, unexpire=True): if not context.identity_map.has_key(identitykey): context.identity_map[identitykey] = instance - for prop in self.__props.values(): - prop.execute(context, instance, row, identitykey, True) + if self.extension.populate_instance(self, context, row, instance, identitykey, True) is EXT_PASS: + self.populate_instance(context, instance, row, identitykey, True) if self.extension.append_result(self, context, row, instance, identitykey, result, isnew) is EXT_PASS: if result is not None: result.append(instance) -- 2.47.2