diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-03 20:57:37 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-01-03 20:57:37 +0000 |
| commit | d24133e5c574676bbc0f30c2186d8da25f550ecb (patch) | |
| tree | c544725ccb5e76b8fbbdcb8f93309ed67817dbfd /lib/sqlalchemy/sql | |
| parent | a2c727788e6746b58455c2c4cbd584043b66077d (diff) | |
| download | sqlalchemy-d24133e5c574676bbc0f30c2186d8da25f550ecb.tar.gz | |
- Fixed a column arithmetic bug that affected column
correspondence for cloned selectables which contain
free-standing column expressions. This bug is
generally only noticeable when exercising newer
ORM behavior only availble in 0.6 via [ticket:1568],
but is more correct at the SQL expression level
as well. [ticket:1617]
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 842e76d15..43b22fc8e 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -1967,7 +1967,8 @@ class FromClause(Selectable): target_set = column.proxy_set cols = self.c for c in cols: - i = c.proxy_set.intersection(target_set) + i = target_set.intersection(itertools.chain(*[p._cloned_set for p in c.proxy_set])) + if i and \ (not require_embedded or c.proxy_set.issuperset(target_set)): |