summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ansisql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-08-07 00:42:55 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-08-07 00:42:55 +0000
commit2eaaa50b465197d497e0b437d37c339c01b4f3c8 (patch)
treed18079cb2d5182db79110b9a36e3f80237d23750 /lib/sqlalchemy/ansisql.py
parent66a86fe2e3be52f27a142aafcea2798911f7cc42 (diff)
downloadsqlalchemy-2eaaa50b465197d497e0b437d37c339c01b4f3c8.tar.gz
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
-rw-r--r--lib/sqlalchemy/ansisql.py20
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index a5e5a5b19..884588668 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -116,14 +116,14 @@ class ANSICompiler(sql.Compiled):
self.strings[list] = string.join([self.get_str(c) for c in list.clauses], ', ')
def visit_binary(self, binary):
- if isinstance(binary.right, sql.Select):
- s = self.get_str(binary.left) + " " + str(binary.operator) + " (" + self.get_str(binary.right) + ")"
- else:
- s = self.get_str(binary.left) + " " + str(binary.operator) + " " + self.get_str(binary.right)
+ result = self.get_str(binary.left)
+ if binary.operator is not None:
+ result += " " + binary.operator
+ result += " " + self.get_str(binary.right)
if binary.parens:
- self.strings[binary] = "(" + s + ")"
- else:
- self.strings[binary] = s
+ result = "(" + result + ")"
+
+ self.strings[binary] = result
def visit_bindparam(self, bindparam):
self.binds[bindparam.shortname] = bindparam
@@ -181,7 +181,11 @@ class ANSICompiler(sql.Compiled):
for tup in select._clauses:
text += " " + tup[0] + " " + self.get_str(tup[1])
- self.strings[select] = text
+ if getattr(select, 'issubquery', False):
+ self.strings[select] = "(" + text + ")"
+ else:
+ self.strings[select] = text
+
self.froms[select] = "(" + text + ")"