diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-20 12:55:46 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-20 12:55:46 -0500 |
| commit | c5442b3adb56cae15607aad32b4219ac11ae809e (patch) | |
| tree | 0502f97a14672dd089adab6184681cb7a0f3bfea /lib/sqlalchemy/orm/interfaces.py | |
| parent | d505ea71aed44ecae718052131dc0a2fb2c9dd99 (diff) | |
| parent | 6dbf2c3314a797a39624f1e68569bfbbb2b6ac87 (diff) | |
| download | sqlalchemy-c5442b3adb56cae15607aad32b4219ac11ae809e.tar.gz | |
- merge hybrid attributes branch, [ticket:1903]
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 6bcdc6f0f..5686bdd33 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -469,8 +469,10 @@ class PropertyOption(MapperOption): path_element = entity.path_entity mapper = entity.mapper mappers.append(mapper) - prop = mapper.get_property(token, - resolve_synonyms=True, raiseerr=raiseerr) + if mapper.has_property(token): + prop = mapper.get_property(token) + else: + prop = None key = token elif isinstance(token, PropComparator): prop = token.property |