summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py3
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))