From 6eb9c11e7b0b99d7bc76633fbfebf6e280ae9994 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 8 Jan 2008 21:53:37 +0000 Subject: - fixed bug in union() so that select() statements which don't derive from FromClause objects can be unioned --- lib/sqlalchemy/sql/expression.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/expression.py') diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 3dc7242d7..b2eaa4221 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2898,7 +2898,8 @@ class CompoundSelect(_SelectBaseMixin, FromClause): _SelectBaseMixin.__init__(self, **kwargs) for s in self.selects: - self.oid_column = self._proxy_column(s.oid_column) + if s.oid_column: + self.oid_column = self._proxy_column(s.oid_column) def self_group(self, against=None): -- cgit v1.2.1