diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-02 19:33:19 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-02 19:33:19 -0400 |
| commit | 02ae3cd54d0c47850ae1c894abae256a4717fe2d (patch) | |
| tree | 25420db57c3a82e195e6e7379f6cc0b0614d5e04 /lib/sqlalchemy/orm/query.py | |
| parent | af3fa1f69c077789b8a1c5078d1bb94a8d5e2240 (diff) | |
| download | sqlalchemy-02ae3cd54d0c47850ae1c894abae256a4717fe2d.tar.gz | |
getting things to join without subqueries, but some glitches in the compiler step
when we do query.count() are showing
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index beae7aba0..25ffb0127 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1862,19 +1862,20 @@ class Query(object): (right_selectable.description, right_mapper.mapped_table.description)) - if not isinstance(right_selectable, expression.Alias): - right_selectable = right_selectable.alias() + if not isinstance(right_selectable, expression.Join): + if not isinstance(right_selectable, expression.Alias): + right_selectable = right_selectable.alias() + need_adapter = True right = aliased(right_mapper, right_selectable) - need_adapter = True aliased_entity = right_mapper and \ not right_is_aliased and \ ( - right_mapper.with_polymorphic or - isinstance( - right_mapper.mapped_table, - expression.Join) + right_mapper.with_polymorphic + #isinstance( + # right_mapper.mapped_table, + # expression.Join) ) if not need_adapter and (create_aliases or aliased_entity): @@ -1946,7 +1947,6 @@ class Query(object): clause = left_selectable assert clause is not None - try: clause = orm_join(clause, right, onclause, isouter=outerjoin) except sa_exc.ArgumentError as ae: |
