Show the conflicting column in the warning!

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 7846ac3b20e61d1fa1c982be63391efda830383e..3644cabc39692d57b38c777435ac295ca2b7a68b 100644 (file)
--- 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