From 51acad4b5bf4ec5517d66e111d625ac0a0fd443e Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 6 Mar 2006 01:17:12 +0000 Subject: more tweak to compoundselect parenthesizing/subquery flag --- lib/sqlalchemy/ansisql.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/ansisql.py') diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 7b39d5358..64715cb4f 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -186,7 +186,7 @@ class ANSICompiler(sql.Compiled): # if we are within a visit to a Select, set up the "typemap" # for this column which is used to translate result set values self.typemap.setdefault(column.key.lower(), column.type) - if column.table is not None and column.table.name is None: + if column.table is None or column.table.name is None: self.strings[column] = column.name else: self.strings[column] = "%s.%s" % (column.table.name, column.name) @@ -368,7 +368,7 @@ class ANSICompiler(sql.Compiled): text += self.visit_select_postclauses(select) - if getattr(select, 'issubquery', False): + if getattr(select, 'useparens', False): self.strings[select] = "(" + text + ")" else: self.strings[select] = text -- cgit v1.2.1