summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/schema.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-12-08 19:25:04 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-12-08 19:25:04 -0500
commit33bafcb132ed959f072f98fa488b05e5628f097b (patch)
tree977e71fe9c8cc42270f94d05759073f4d93727ed /lib/sqlalchemy/schema.py
parentc183aa098bbbe9298090df9dcf6adad0be38f6c7 (diff)
downloadsqlalchemy-33bafcb132ed959f072f98fa488b05e5628f097b.tar.gz
Fixed bug whereby using a label_length on dialect that was smaller
than the size of actual column identifiers would fail to render the columns correctly in a SELECT statement. [ticket:2610]
Diffstat (limited to 'lib/sqlalchemy/schema.py')
-rw-r--r--lib/sqlalchemy/schema.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 2fb542a43..4f3655a1d 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1114,7 +1114,8 @@ class Column(SchemaItem, expression.ColumnClause):
c.dispatch._update(self.dispatch)
return c
- def _make_proxy(self, selectable, name=None, key=None):
+ def _make_proxy(self, selectable, name=None, key=None,
+ name_is_truncatable=False, **kw):
"""Create a *proxy* for this column.
This is a copy of this ``Column`` referenced by a different parent
@@ -1130,7 +1131,8 @@ class Column(SchemaItem, expression.ColumnClause):
"been assigned.")
try:
c = self._constructor(
- expression._as_truncated(name or self.name),
+ expression._as_truncated(name or self.name) if \
+ name_is_truncatable else (name or self.name),
self.type,
key=key if key else name if name else self.key,
primary_key=self.primary_key,