few more tweaks for the aliasing change

diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py
index 0072f4686994e2417fa0d6a13c184fc41be5a54f..32c6e7ac483c419e82b09bc2ca3627cca7a27943 100644 (file)
--- 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 36dd99ae8d4aa33f98f9fa4045f223a19c1e1157..0fccba0293f61923bb7b59c539b33e6a74ba9f10 100644 (file)
--- 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