diff options
| author | Chris Withers <chris@simplistix.co.uk> | 2013-05-22 08:38:44 +0100 |
|---|---|---|
| committer | Chris Withers <chris@simplistix.co.uk> | 2013-05-26 13:05:59 +0100 |
| commit | e8b4f0bc4a4bfdfe612683006cd5086ab599fa4d (patch) | |
| tree | 5a8c0fbd2b97ee3da4c9b630fce7bdba73550c64 /lib/sqlalchemy/sql/expression.py | |
| parent | f5956fae6a67868ea89dd1518f380fb8264acc34 (diff) | |
| download | sqlalchemy-e8b4f0bc4a4bfdfe612683006cd5086ab599fa4d.tar.gz | |
Show the conflicting column in the warning!
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 7846ac3b2..3644cabc3 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2485,9 +2485,9 @@ class ColumnCollection(util.OrderedProperties): existing = self[key] if not existing.shares_lineage(value): util.warn('Column %r on table %r being replaced by ' - 'another column with the same key. Consider ' + '%r , which has the same key. Consider ' 'use_labels for select() statements.' % (key, - getattr(existing, 'table', None))) + getattr(existing, 'table', None), value)) self._all_cols.remove(existing) # pop out memoized proxy_set as this # operation may very well be occurring |