diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-04-14 23:44:03 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-04-14 23:44:03 -0400 |
commit | 2d34ded2d8a84471be2d1ff03772af9292b36a54 (patch) | |
tree | 48aa3bd10324198e13fdcc6282f509113a3293b0 /lib/sqlalchemy/sql/expression.py | |
parent | 7cd4ccabafd19a2c97ffe9bbd43b28ede30b61b7 (diff) | |
download | sqlalchemy-2d34ded2d8a84471be2d1ff03772af9292b36a54.tar.gz |
- fixed bug where "from" clause gathering from an
over() clause would be an itertools.chain() and
not a list, causing "can only concatenate list"
TypeError when combined with other clauses.
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index f5ec41a60..c9647e1bd 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3704,11 +3704,11 @@ class _Over(ColumnElement): @property def _from_objects(self): - return itertools.chain( + return list(itertools.chain( *[c._from_objects for c in (self.func, self.partition_by, self.order_by) if c is not None] - ) + )) class _Label(ColumnElement): """Represents a column label (AS). |