diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-04 16:48:14 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-04 16:48:14 -0400 |
| commit | 58e917fe2de2f4b643f3bf2468f51aef27e67747 (patch) | |
| tree | d3753a8e38cee7d4254880776469b4f1b19003b3 /lib/sqlalchemy | |
| parent | 51e1019f610f083ac4d8c850589cdf52cff044da (diff) | |
| download | sqlalchemy-58e917fe2de2f4b643f3bf2468f51aef27e67747.tar.gz | |
- eager loads
- two suite of SQL assertions converted
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index baaf4cb92..cabfb35b9 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -1089,8 +1089,7 @@ class JoinedLoader(AbstractRelationshipLoader): to_adapt = with_poly_info.entity else: to_adapt = orm_util.AliasedClass(self.mapper, - use_mapper_path=True, - flat=True) + use_mapper_path=True) clauses = orm_util.ORMAdapter( to_adapt, equivalents=self.mapper._equivalent_columns, diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 3da6e89e3..c21e7eace 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -493,7 +493,7 @@ class AliasedClass(object): """ def __init__(self, cls, alias=None, name=None, - flat=False, + flat=True, adapt_on_names=False, # TODO: None for default here? with_polymorphic_mappers=(), |