diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/strategy_options.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py index b3913ec5b..6c6f0307d 100644 --- a/lib/sqlalchemy/orm/strategy_options.py +++ b/lib/sqlalchemy/orm/strategy_options.py @@ -15,6 +15,7 @@ from .base import _is_aliased_class from .base import _is_mapped_class from .base import InspectionAttr from .interfaces import LoaderOption +from .interfaces import MapperProperty from .interfaces import PropComparator from .path_registry import _DEFAULT_TOKEN from .path_registry import _WILDCARD_TOKEN @@ -170,6 +171,7 @@ class Load(Generative, LoaderOption): if isinstance(attr, util.string_types): default_token = attr.endswith(_DEFAULT_TOKEN) + attr_str_name = attr if attr.endswith(_WILDCARD_TOKEN) or default_token: if default_token: self.propagate_to_loaders = False @@ -207,7 +209,21 @@ class Load(Generative, LoaderOption): else: return None else: - attr = found_property = attr.property + try: + attr = found_property = attr.property + except AttributeError as ae: + if not isinstance(attr, MapperProperty): + util.raise_( + sa_exc.ArgumentError( + 'Expected attribute "%s" on %s to be a ' + "mapped attribute; " + "instead got %s object." + % (attr_str_name, ent, type(attr)) + ), + replace_context=ae, + ) + else: + raise path = path[attr] elif _is_mapped_class(attr): |