summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-08-28 17:11:18 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-08-28 17:11:18 +0000
commitaf342bba5600fc312f8efc1d3942301c57ca845f (patch)
tree65bbb2a86a7b36343a2d0b352ecbf44a5b981398 /lib/sqlalchemy
parentc99d54e762790578a6c806f6f96da218af2a0f37 (diff)
downloadsqlalchemy-af342bba5600fc312f8efc1d3942301c57ca845f.tar.gz
- Fixed bug whereby deferred() columns with a group in conjunction
with an otherwise unrelated synonym() would produce an AttributeError during deferred load.
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/strategies.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e0166e56c..f254052ec 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -13,7 +13,7 @@ from sqlalchemy.sql import visitors, expression, operators
from sqlalchemy.orm import mapper, attributes
from sqlalchemy.orm.interfaces import (
LoaderStrategy, StrategizedOption, MapperOption, PropertyOption,
- serialize_path, deserialize_path
+ serialize_path, deserialize_path, StrategizedProperty
)
from sqlalchemy.orm import session as sessionlib
from sqlalchemy.orm import util as mapperutil
@@ -247,7 +247,13 @@ class LoadDeferredColumns(object):
if self.keys:
toload = self.keys
elif strategy.group:
- toload = [p.key for p in localparent.iterate_properties if isinstance(p.strategy, DeferredColumnLoader) and p.group==strategy.group]
+ toload = [
+ p.key for p in
+ localparent.iterate_properties
+ if isinstance(p, StrategizedProperty) and
+ isinstance(p.strategy, DeferredColumnLoader) and
+ p.group==strategy.group
+ ]
else:
toload = [self.key]