diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-27 16:43:01 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-27 16:43:01 -0400 |
| commit | fc348366f76bdb3072c69ad8e03f305de38d486c (patch) | |
| tree | 1f05d7557819fa35006ca51c1a5a1ec47d861542 /lib/sqlalchemy | |
| parent | 3e52710a79857bf9249d71eaf9af0f6ed5edc76a (diff) | |
| download | sqlalchemy-fc348366f76bdb3072c69ad8e03f305de38d486c.tar.gz | |
- fix a regression caused by #2587, where query.join() would apply an
adapter to an aliased-mapped, non-polymorphic selectable that prevented us from referring
directly to that selectable.
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index bd3ee8f72..7454c4853 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1892,7 +1892,7 @@ class Query(object): aliased_entity = right_mapper and \ not right_is_aliased and \ ( - isinstance( + right_mapper.with_polymorphic and isinstance( right_mapper._with_polymorphic_selectable, expression.Alias) or |