summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/mssql.py
diff options
context:
space:
mode:
authorMichael Trier <mtrier@gmail.com>2008-11-12 05:36:45 +0000
committerMichael Trier <mtrier@gmail.com>2008-11-12 05:36:45 +0000
commit260c201f656ce3afe35f9ae069cdf46593d4dffb (patch)
treed0f7c7619c173e0cc3271c7c8e05091c85fb5d7e /lib/sqlalchemy/databases/mssql.py
parent097f76b465fbb8dce3f8b6b96c1a54a76c4045ba (diff)
downloadsqlalchemy-260c201f656ce3afe35f9ae069cdf46593d4dffb.tar.gz
Corrected mssql schema named subqueries from not properly aliasing the columns. Fixes #973.
Diffstat (limited to 'lib/sqlalchemy/databases/mssql.py')
-rw-r--r--lib/sqlalchemy/databases/mssql.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index a313b98bc..d806492c6 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -1001,7 +1001,8 @@ class MSSQLCompiler(compiler.DefaultCompiler):
return super(MSSQLCompiler, self).visit_alias(alias, **kwargs)
def visit_column(self, column, result_map=None, **kwargs):
- if column.table is not None and not self.isupdate and not self.isdelete:
+ if column.table is not None and \
+ (not self.isupdate and not self.isdelete) or self.is_subquery():
# translate for schema-qualified table aliases
t = self._schema_aliased_table(column.table)
if t is not None:
@@ -1009,9 +1010,9 @@ class MSSQLCompiler(compiler.DefaultCompiler):
if result_map is not None:
result_map[column.name.lower()] = (column.name, (column, ), column.type)
-
+
return super(MSSQLCompiler, self).visit_column(converted, result_map=None, **kwargs)
-
+
return super(MSSQLCompiler, self).visit_column(column, result_map=result_map, **kwargs)
def visit_binary(self, binary, **kwargs):