From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 25 Apr 2013 18:16:54 +0000 (-0400)
Subject: heh dont need that either
X-Git-Tag: rel_0_8_1~3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed0bdb2ae92e4589a6e90e789b3645c555c770b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

heh dont need that either
---

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index b6e0b5ce78..7846ac3b20 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)