- _Label adds itself to the proxy collection so that it works in correspoinding column. fixes some eager load with column_property bugs.

- this partially fixes some issues in [ticket:1022] but leaving the "unlabeled" fix for 0.5 for now

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 269d31661..867fdd69c 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -1733,7 +1733,10 @@ class FromClause(Selectable):
 
         col, intersect = None, None
         target_set = column.proxy_set
-        for c in self.c + [self.oid_column]:
+        cols = self.c
+        if self.oid_column:
+            cols += [self.oid_column]
+        for c in cols:
             i = c.proxy_set.intersection(target_set)
             if i and \
                 (not require_embedded or c.proxy_set.issuperset(target_set)) and \
@@ -2553,9 +2556,11 @@ class _Label(ColumnElement):
 
     def _make_proxy(self, selectable, name = None):
         if isinstance(self.obj, (Selectable, ColumnElement)):
-            return self.obj._make_proxy(selectable, name=self.name)
+            e = self.obj._make_proxy(selectable, name=self.name)
         else:
-            return column(self.name)._make_proxy(selectable=selectable)
+            e = column(self.name)._make_proxy(selectable=selectable)
+        e.proxies.append(self)
+        return e
 
 class _ColumnClause(ColumnElement):
     """Represents a generic column expression from any textual string.