From a74da6d21e7f5f2dd31dbaa8bc6cbf11e165360e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 6 Jun 2007 23:37:18 +0000 Subject: - fixed bug where selectable.corresponding_column(selectable.c.col) would not return selectable.c.col, if the selectable is a join of a table and another join involving the same table. messed up ORM decision making [ticket:593] --- lib/sqlalchemy/sql.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql.py') diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index fb32c0f07..3a8a27d67 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -1670,7 +1670,9 @@ class FromClause(Selectable): it merely shares a common anscestor with one of the exported columns of this ``FromClause``. """ - + if column in self.c: + return column + if require_embedded and column not in util.Set(self._get_all_embedded_columns()): if not raiseerr: return None -- cgit v1.2.1