summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-01-08 21:53:37 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-01-08 21:53:37 +0000
commit6eb9c11e7b0b99d7bc76633fbfebf6e280ae9994 (patch)
tree045a1900667782417386dfe0c4ef7f25f7fbda50 /lib/sqlalchemy
parent93d6f1d58ad3aa9d4da61178553ea0e914426cd1 (diff)
downloadsqlalchemy-6eb9c11e7b0b99d7bc76633fbfebf6e280ae9994.tar.gz
- fixed bug in union() so that select() statements which don't derive
from FromClause objects can be unioned
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/sql/expression.py3
1 files changed, 2 insertions, 1 deletions
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):