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/strategies.py | |
| parent | d505ea71aed44ecae718052131dc0a2fb2c9dd99 (diff) | |
| parent | 6dbf2c3314a797a39624f1e68569bfbbb2b6ac87 (diff) | |
| download | sqlalchemy-c5442b3adb56cae15607aad32b4219ac11ae809e.tar.gz | |
- merge hybrid attributes branch, [ticket:1903]
Diffstat (limited to 'lib/sqlalchemy/orm/strategies.py')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 578ef2de1..1c316c3c0 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -1287,7 +1287,7 @@ class LoadEagerFromAliasOption(PropertyOption): if isinstance(self.alias, basestring): mapper = mappers[-1] (root_mapper, propname) = paths[-1][-2:] - prop = mapper.get_property(propname, resolve_synonyms=True) + prop = mapper.get_property(propname) self.alias = prop.target.alias(self.alias) query._attributes[ ("user_defined_eager_row_processor", @@ -1296,7 +1296,7 @@ class LoadEagerFromAliasOption(PropertyOption): else: (root_mapper, propname) = paths[-1][-2:] mapper = mappers[-1] - prop = mapper.get_property(propname, resolve_synonyms=True) + prop = mapper.get_property(propname) adapter = query._polymorphic_adapters.get(prop.mapper, None) query._attributes[ ("user_defined_eager_row_processor", |