From 541a61fe0d8f74200b341645825b3c665db5bbd3 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 3 Apr 2006 22:04:08 +0000 Subject: [PATCH] adjustments to auto-table-aliasing logic (R. Morrison) --- lib/sqlalchemy/databases/mssql.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 6671276554..582ed90026 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -430,9 +430,7 @@ class MSSQLCompiler(ansisql.ANSICompiler): def visit_table(self, table): # alias schema-qualified tables - if self.tablealiases.has_key(table): - super(MSSQLCompiler, self).visit_table(table) - elif getattr(table, 'schema', None) is not None: + if getattr(table, 'schema', None) is not None and not self.tablealiases.has_key(table): alias = table.alias() self.tablealiases[table] = alias alias.accept_visitor(self) @@ -441,7 +439,9 @@ class MSSQLCompiler(ansisql.ANSICompiler): c.accept_visitor(self) self.tablealiases[alias] = self.froms[table] self.froms[table] = self.froms[alias] - + else: + super(MSSQLCompiler, self).visit_table(table) + def visit_alias(self, alias): # translate for schema-qualified table aliases if self.froms.has_key(('alias', alias.original)): -- 2.47.2