summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-04-04 16:06:58 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-04-04 16:06:58 +0000
commit1a684567958d548f7ed68ba34bc17bffbadfb8ee (patch)
tree0c224ad489d1a43e7e3bf8f914dba4dcdc951693 /lib/sqlalchemy
parentc4eeabc60bddca6857982c894516268ecdb48b68 (diff)
downloadsqlalchemy-1a684567958d548f7ed68ba34bc17bffbadfb8ee.tar.gz
fixed union() bug whereby oid_column would not be available if no oid_column in embedded selects
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/sql/expression.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 9272e6d82..2ed3b372f 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2993,11 +2993,14 @@ class CompoundSelect(_SelectBaseMixin, FromClause):
self.selects.append(s)
_SelectBaseMixin.__init__(self, **kwargs)
-
+
+ self.oid_column = None
for s in self.selects:
+ # TODO: need to repair proxy_column here to
+ # not require full traversal
if s.oid_column:
self.oid_column = self._proxy_column(s.oid_column)
-
+
def self_group(self, against=None):
return _FromGrouping(self)