diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-31 13:01:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-03-31 13:01:40 -0400 |
| commit | 5c758932a512e281308d2e1c147e18ed4eddc6b0 (patch) | |
| tree | 88ae1d02eb2f049b1842c1aebb02788f77702fce /lib/sqlalchemy/sql/expression.py | |
| parent | 4cbe117eb2feb7cff28c66d849d3a0613448fdce (diff) | |
| download | sqlalchemy-5c758932a512e281308d2e1c147e18ed4eddc6b0.tar.gz | |
- Restored some bind-labeling logic from 0.5 which ensures
that tables with column names that overlap another column
of the form "<tablename>_<columnname>" won't produce
errors if column._label is used as a bind name during
an UPDATE. Test coverage which wasn't present in 0.5
has been added. [ticket:1755]
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -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: |