diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-04 10:38:29 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-04-04 10:38:29 -0400 |
| commit | f05b5b0bda7b21a585f3252016d2e74c361b6233 (patch) | |
| tree | 56f94f0b1088b9738ae363832b1466f7a98befdd /lib/sqlalchemy/sql | |
| parent | 3d3095497b872696e8860763f54217f425c7d35b (diff) | |
| parent | dbc582a43fb8e5d3c0b05cb62b6a77c4e5bc27ac (diff) | |
| download | sqlalchemy-f05b5b0bda7b21a585f3252016d2e74c361b6233.tar.gz | |
merge default branch
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 10 |
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: |