summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 3aaa06fd6..5958a0bc4 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -3185,6 +3185,16 @@ class ColumnClause(_Immutable, ColumnElement):
label = _escape_for_generated(self.table.name) + "_" + \
_escape_for_generated(self.name)
+ # ensure the label name doesn't conflict with that
+ # of an existing column
+ if label in self.table.c:
+ _label = label
+ counter = 1
+ while _label in self.table.c:
+ _label = label + "_" + str(counter)
+ counter += 1
+ label = _label
+
return _generated_label(label)
else: