diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-24 13:19:34 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-24 13:19:34 -0400 |
| commit | 9c68542116285c94bc2584edcd25fec6cf305eba (patch) | |
| tree | 03a9249d35693a60d3faf1059b650a35458e5b75 /lib/sqlalchemy/orm/query.py | |
| parent | 4a794aa5481b3d6e6ab3bae6d12c39d8cb228da8 (diff) | |
| download | sqlalchemy-9c68542116285c94bc2584edcd25fec6cf305eba.tar.gz | |
everything everything passes on this one. still want to get rid of that hack tho.
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index c56804847..d0827df84 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1069,7 +1069,8 @@ class Query(object): left = self._joinpoint_zero() if left is right and \ - not create_aliases: + not create_aliases and \ + not self._entity_zero()._subq_aliasing: raise sa_exc.InvalidRequestError( "Can't construct a join from %s to %s, they are the same entity" % (left, right)) |