diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-02-12 21:16:31 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-02-12 21:16:31 +0000 |
commit | 9fffa2c7e1539689750ead7cd70f2d4812322a77 (patch) | |
tree | b1e29451f30ec66505c646d9cac9a6ce44f97490 /lib/sqlalchemy/sql/expression.py | |
parent | 85e8cb7ffb9134fa34135bf83d231e0e55b0d0cf (diff) | |
download | sqlalchemy-9fffa2c7e1539689750ead7cd70f2d4812322a77.tar.gz |
- fixed bug introduced in r4070 where union() and other compound selects would not get
an OID column if it only contained one selectable element, due to missing return in _proxy_column()
- visit_column() calls itself to render a primary key col being used as the interpretation of the oid col instead of relying upon broken partial logic
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 79eb1759d..0b7684803 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2935,7 +2935,6 @@ class CompoundSelect(_SelectBaseMixin, FromClause): if s.oid_column: self.oid_column = self._proxy_column(s.oid_column) - def self_group(self, against=None): return _FromGrouping(self) @@ -2956,6 +2955,7 @@ class CompoundSelect(_SelectBaseMixin, FromClause): else: col = column._make_proxy(self) col_ordering.append(col) + return col else: col_ordering.append(column) existing = self._col_map[self.selects[0]][len(col_ordering) - 1] |