diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-08-06 22:06:15 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-08-06 22:06:15 +0000 |
| commit | 66a86fe2e3be52f27a142aafcea2798911f7cc42 (patch) | |
| tree | 3869ff130aa732b349cc2fac459b22559998fc9e /lib/sqlalchemy/ansisql.py | |
| parent | c2c8b14815a7231105f2b0f322e7c1c128fb126c (diff) | |
| download | sqlalchemy-66a86fe2e3be52f27a142aafcea2798911f7cc42.tar.gz | |
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
| -rw-r--r-- | lib/sqlalchemy/ansisql.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 93e7e737d..a5e5a5b19 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -116,11 +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) if binary.parens: - self.strings[binary] = "(" + self.get_str(binary.left) + " " + str(binary.operator) + " " + self.get_str(binary.right) + ")" + self.strings[binary] = "(" + s + ")" else: - self.strings[binary] = self.get_str(binary.left) + " " + str(binary.operator) + " " + self.get_str(binary.right) + self.strings[binary] = s def visit_bindparam(self, bindparam): self.binds[bindparam.shortname] = bindparam @@ -136,6 +139,7 @@ class ANSICompiler(sql.Compiled): def visit_alias(self, alias): self.froms[alias] = self.get_from_text(alias.selectable) + " " + alias.name + self.strings[alias] = self.get_str(alias.selectable) def visit_select(self, select): inner_columns = [] @@ -183,6 +187,7 @@ class ANSICompiler(sql.Compiled): def visit_table(self, table): self.froms[table] = table.name + self.strings[table] = "" def visit_join(self, join): if join.isouter: @@ -194,7 +199,6 @@ class ANSICompiler(sql.Compiled): def visit_insert(self, insert_stmt): colparams = insert_stmt.get_colparams(self._bindparams) - for c in colparams: b = c[1] self.binds[b.key] = b |