From 4e285fd6ba2cbaf4b43e943a0e6bb45cc104cf08 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 6 Sep 2014 16:20:01 -0400
Subject: - 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

---
 lib/sqlalchemy/sql/selectable.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sqlalchemy/sql/selectable.py')

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:
-- 
cgit v1.2.1