diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-06 16:20:01 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-09-06 16:20:01 -0400 |
| commit | 4e285fd6ba2cbaf4b43e943a0e6bb45cc104cf08 (patch) | |
| tree | 2f7f4030c34088b94a5d2cdb19f1a0f5df730e05 /lib/sqlalchemy/sql/selectable.py | |
| parent | 6844f8db74ab2ba5df98ba285be34a2534a88b5b (diff) | |
| download | sqlalchemy-4e285fd6ba2cbaf4b43e943a0e6bb45cc104cf08.tar.gz | |
- document all the varities of _label on the base ColumnElement
- replace out _columns_clause_label with a straight boolean flag to
reduce the proliferation of labels
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index a49493995..b802a6944 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -2974,10 +2974,10 @@ class Select(HasPrefixes, GenerativeSelect): names = set() def name_for_col(c): - if c._columns_clause_label is None: + if c._label is None or not c._render_label_in_columns_clause: return (None, c) - name = c._columns_clause_label + name = c._label if name in names: name = c.anon_label else: |