From 2dbeeff50b7ccc6f47b2816a59f99f051fdabc8c Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 5 Feb 2012 16:58:32 -0500
Subject: - [bug] Added support for using the .key of a Column as a string
 identifier in a result set row.   The .key is currently listed as an
 "alternate" name for a column, and is superseded by the name of a column
 which has that key value as its regular name. For the next major release of
 SQLAlchemy we may reverse this precedence so that .key takes precedence, but
 this is not decided on yet.  [ticket:2392]

---
 lib/sqlalchemy/sql/expression.py | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

(limited to 'lib/sqlalchemy/sql/expression.py')

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 939456b9a..b11e5ad42 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2105,6 +2105,8 @@ class ColumnElement(ClauseElement, _CompareMixin):
     foreign_keys = []
     quote = None
     _label = None
+    _key_label = None
+    _alt_names = ()
 
     @property
     def _select_iterable(self):
@@ -3851,9 +3853,12 @@ class _Label(ColumnElement):
     def __init__(self, name, element, type_=None):
         while isinstance(element, _Label):
             element = element.element
-        self.name = self.key = self._label = name \
-            or _anonymous_label('%%(%d %s)s' % (id(self),
+        if name:
+            self.name = name
+        else:
+            self.name = _anonymous_label('%%(%d %s)s' % (id(self),
                                 getattr(element, 'name', 'anon')))
+        self.key = self._label = self._key_label = self.name
         self._element = element
         self._type = type_
         self.quote = element.quote
@@ -4000,8 +4005,18 @@ class ColumnClause(_Immutable, ColumnElement):
         return self.name.encode('ascii', 'backslashreplace')
         # end Py2K
 
+    @_memoized_property
+    def _key_label(self):
+        if self.key != self.name:
+            return self._gen_label(self.key)
+        else:
+            return self._label
+
     @_memoized_property
     def _label(self):
+        return self._gen_label(self.name)
+
+    def _gen_label(self, name):
         t = self.table
         if self.is_literal:
             return None
@@ -4009,9 +4024,9 @@ class ColumnClause(_Immutable, ColumnElement):
         elif t is not None and t.named_with_column:
             if getattr(t, 'schema', None):
                 label = t.schema.replace('.', '_') + "_" + \
-                            t.name + "_" + self.name
+                            t.name + "_" + name
             else:
-                label = t.name + "_" + self.name
+                label = t.name + "_" + name
 
             # ensure the label name doesn't conflict with that
             # of an existing column
@@ -4026,7 +4041,7 @@ class ColumnClause(_Immutable, ColumnElement):
             return _as_truncated(label)
 
         else:
-            return self.name
+            return name
 
     def label(self, name):
         # currently, anonymous labels don't occur for 
@@ -5041,7 +5056,9 @@ class Select(_SelectBase):
     def _populate_column_collection(self):
         for c in self.inner_columns:
             if hasattr(c, '_make_proxy'):
-                c._make_proxy(self, name=self.use_labels and c._label or None)
+                c._make_proxy(self, 
+                        name=self.use_labels 
+                            and c._label or None)
 
     def self_group(self, against=None):
         """return a 'grouping' construct as per the ClauseElement
-- 
cgit v1.2.1