summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-11-05 03:58:36 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-11-05 03:58:36 +0000
commit6ab0aeed67d5da1f2f8e481108d83c4471e6244c (patch)
tree6441e457d560c2961f99d6e6e3ca3273ad86d255 /lib/sqlalchemy/sql.py
parent687189c6ff4ea877846834cef936bbe90159edc4 (diff)
downloadsqlalchemy-6ab0aeed67d5da1f2f8e481108d83c4471e6244c.tar.gz
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 506fb514f..5a45226e4 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -529,7 +529,10 @@ class Selectable(FromClause):
def alias(self, name):
return Alias(self, name)
-
+ def union(self, other, **kwargs):
+ return union(self, other, **kwargs)
+ def union_all(self, other, **kwargs):
+ return union_all(self, other, **kwargs)
def group_parenthesized(self):
"""indicates if this Selectable requires parenthesis when grouped into a compound statement"""
return True
@@ -817,7 +820,6 @@ class Select(Selectable):
def compile(self, engine = None, bindparams = None):
if engine is None:
engine = self.engine
- print "ok, and engine is " + repr(self.engine)
if engine is None:
raise "no engine supplied, and no engine could be located within the clauses!"
@@ -855,12 +857,9 @@ class Select(Selectable):
return self._engine
for f in self._froms.values():
- print repr(self) + " looking in " + repr(f)
e = f.engine
- print " and its " + repr(e)
if e is not None:
self._engine = e
- print "returning it !"
return e
return None