diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-24 11:24:23 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-24 11:24:23 -0400 |
commit | 9b73e997b2325018555268e1f1069e88e80fdb85 (patch) | |
tree | 6cd512b1a8395f8dd9edb5915323603ef108db70 /lib/sqlalchemy/schema.py | |
parent | 3d4c6f68167d33b28e0c3b12032058ad0d807d58 (diff) | |
download | sqlalchemy-9b73e997b2325018555268e1f1069e88e80fdb85.tar.gz |
- [bug] The names of the columns on the
.c. attribute of a select().apply_labels()
is now based on <tablename>_<colkey> instead
of <tablename>_<colname>, for those columns
that have a distinctly named .key.
[ticket:2397]
Diffstat (limited to 'lib/sqlalchemy/schema.py')
-rw-r--r-- | lib/sqlalchemy/schema.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 9746af228..0a22d8855 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -1084,7 +1084,7 @@ class Column(SchemaItem, expression.ColumnClause): c.dispatch._update(self.dispatch) return c - def _make_proxy(self, selectable, name=None): + def _make_proxy(self, selectable, name=None, key=None): """Create a *proxy* for this column. This is a copy of this ``Column`` referenced by a different parent @@ -1102,7 +1102,7 @@ class Column(SchemaItem, expression.ColumnClause): c = self._constructor( expression._as_truncated(name or self.name), self.type, - key = name or self.key, + key = key if key else name if name else self.key, primary_key = self.primary_key, nullable = self.nullable, quote=self.quote, _proxies=[self], *fk) |