From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 16 Jul 2007 20:33:31 +0000 (+0000)
Subject: few more tweaks for the aliasing change
X-Git-Tag: rel_0_4_6~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6044803eba82870547dbd0cad5c9cf0ac633935;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

few more tweaks for the aliasing change
---

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 0072f46869..32c6e7ac48 100644
--- a/lib/sqlalchemy/ansisql.py
+++ b/lib/sqlalchemy/ansisql.py
@@ -275,6 +275,7 @@ class ANSICompiler(engine.Compiled):
             self.typemap.setdefault(labelname.lower(), label.obj.type)
             if isinstance(label.obj, sql._ColumnClause):
                 self.column_labels[label.obj._label] = labelname
+            self.column_labels[label.name] = labelname
         self.strings[label] = self.strings[label.obj] + " AS "  + self.preparer.format_label(label, labelname)
         
     def visit_column(self, column):
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 36dd99ae8d..0fccba0293 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -535,7 +535,7 @@ class EagerLoader(AbstractRelationLoader):
                     select.append_correlation(self.eagertarget)
             aliased_column = sql_util.ClauseAdapter(self.eagertarget).chain(ModifySubquery()).traverse(aliased_column, clone=True)
             aliased_column = aliased_column.label(None)
-            self._row_decorator.map[column] = alias
+            self._row_decorator.map[column] = aliased_column
             self.extra_cols[column] = aliased_column
             return aliased_column