diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-12-04 17:06:55 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-12-04 17:06:55 +0000 |
| commit | cb46ae4fe97d364e8a160b6114519f125432c1e8 (patch) | |
| tree | 7587e312c51101ff86a45b4dbaaa5338a0a5ed6a /lib/sqlalchemy/sql/compiler.py | |
| parent | f5a4554c52b82cc7fb3da41eb51e6e9b5bd3c526 (diff) | |
| download | sqlalchemy-cb46ae4fe97d364e8a160b6114519f125432c1e8.tar.gz | |
- relaxed rules on column_property() expressions having labels; any
ColumnElement is accepted now, as the compiler auto-labels non-labeled
ColumnElements now. a selectable, like a select() statement, still
requires conversion to ColumnElement via as_scalar() or label().
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 9b24dd521..d94d3fef6 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -438,7 +438,7 @@ class DefaultCompiler(engine.Compiled): if isinstance(column, sql._Label): return column - if select.use_labels and column._label: + if select.use_labels and getattr(column, '_label', None): return column.label(column._label) if \ |