summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-04-25 14:16:54 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-04-25 14:16:54 -0400
commit0ed0bdb2ae92e4589a6e90e789b3645c555c770b (patch)
tree35bdd1f9f20586803bf54faf8953a3ce7ecbf7d6 /lib/sqlalchemy/sql/expression.py
parent9506bbe82fe150bd05529b00485edc064edbf418 (diff)
downloadsqlalchemy-0ed0bdb2ae92e4589a6e90e789b3645c555c770b.tar.gz
heh dont need that either
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index b6e0b5ce7..7846ac3b2 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -3910,13 +3910,7 @@ class Join(FromClause):
def is_derived_from(self, fromclause):
return fromclause is self or \
self.left.is_derived_from(fromclause) or \
- self.right.is_derived_from(fromclause) or \
- (
- isinstance(fromclause, Join) and
- self.left.is_derived_from(fromclause.left) and
- self.right.is_derived_from(fromclause.right) and
- self.onclause.compare(fromclause.onclause)
- )
+ self.right.is_derived_from(fromclause)
def self_group(self, against=None):
return FromGrouping(self)