diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-12 16:15:28 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-12 16:15:28 +0000 |
| commit | e02114ce4975714454feacc953cb955aaedb6596 (patch) | |
| tree | a8eca1b42a5ce44982421fe994bf667d3707dfa9 /lib/sqlalchemy/sql/expression.py | |
| parent | 4b6e1a40e5008b369c8da558e51cd8be07cf2c26 (diff) | |
| download | sqlalchemy-e02114ce4975714454feacc953cb955aaedb6596.tar.gz | |
- clause adaption hits _raw_columns of a select() (though no ORM tests need this feature currently)
- broke up adapter chaining in eagerload, erroneous "wrapping" in row_decorator. column_property() subqueries are now affected only by the ORMAdapter for that mapper. fixes [ticket:1037], and may possibly impact some of [ticket:949]
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 7ce637701..9d48b31c1 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3066,7 +3066,7 @@ class Select(_SelectBaseMixin, FromClause): """return child elements as per the ClauseElement specification.""" return (column_collections and list(self.columns) or []) + \ - list(self._froms) + \ + self._raw_columns + list(self._froms) + \ [x for x in (self._whereclause, self._having, self._order_by_clause, self._group_by_clause) if x is not None] def column(self, column): |