From 9fffa2c7e1539689750ead7cd70f2d4812322a77 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 12 Feb 2008 21:16:31 +0000 Subject: - 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 --- lib/sqlalchemy/sql/expression.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/expression.py') 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] -- cgit v1.2.1