diff options
| -rw-r--r-- | lib/sqlalchemy/ext/declarative.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index cf47279e8..3b4880403 100644 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -739,4 +739,3 @@ def _undefer_column_name(key, column): column.key = key if column.name is None: column.name = key - util.reset_memoized(column, 'description')
\ No newline at end of file diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 792a7e923..d454bc7cf 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -609,7 +609,9 @@ class Column(SchemaItem, expression.ColumnClause): "Unknown arguments passed to Column: " + repr(kwargs.keys())) def __str__(self): - if self.table is not None: + if self.name is None: + return "(no name)" + elif self.table is not None: if self.table.named_with_column: return (self.table.description + "." + self.description) else: @@ -617,13 +619,6 @@ class Column(SchemaItem, expression.ColumnClause): else: return self.description - @util.memoized_property - def description(self): - if not self.name: - return "(no name)" - else: - return self.name.encode('ascii', 'backslashreplace') - @property def bind(self): return self.table.bind |