diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 45fe5c4bf..54e864abb 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2794,11 +2794,11 @@ class _ColumnEntity(_QueryEntity): "expected - got '%r'" % column ) - # if the Column is unnamed, give it a + # If the Column is unnamed, give it a # label() so that mutable column expressions # can be located in the result even # if the expression's identity has been changed - # due to adaption + # due to adaption. if not column._label: column = column.label(None) diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 1013f9397..e06eb61be 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -3814,11 +3814,7 @@ class _Label(ColumnElement): return self.element._from_objects def _make_proxy(self, selectable, name = None): - if isinstance(self.element, (Selectable, ColumnElement)): - e = self.element._make_proxy(selectable, name=self.name) - else: - e = column(self.name)._make_proxy(selectable=selectable) - + e = self.element._make_proxy(selectable, name=name or self.name) e.proxies.append(self) return e @@ -3934,6 +3930,12 @@ class ColumnClause(_Immutable, ColumnElement): return self.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: |