- [bug] column.label(None) now produces an

anonymous label, instead of returning the
column object itself, consistent with the behavior
of label(column, None).  [ticket:2168]

2 files changed, 3 insertions, 14 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d50c3922a..dda231e0c 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3240,8 +3240,9 @@ class _ColumnEntity(_QueryEntity):
         # can be located in the result even
         # if the expression's identity has been changed
         # due to adaption.
-        if not column._label:
-            column = column.label(None)
+
+        if not column._label and not getattr(column, 'is_literal', False):
+            column = column.label(self._label_name)
 
         query._entities.append(self)
 
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6147b1640..a0f0bab6c 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -4120,18 +4120,6 @@ class ColumnClause(_Immutable, ColumnElement):
         else:
             return name
 
-    def label(self, name):
-        # currently, anonymous labels don't occur for 
-        # ColumnClause.   The use at the moment
-        # is that they do not generate nicely for 
-        # is_literal clauses.   We would like to change
-        # this so that label(None) acts as would be expected.
-        # See [ticket:2168].
-        if name is None:
-            return self
-        else:
-            return super(ColumnClause, self).label(name)
-
 
     def _bind_param(self, operator, obj):
         return _BindParamClause(self.name, obj,