From: Chris Withers <chris@simplistix.co.uk>
Date: Wed, 22 May 2013 07:38:44 +0000 (+0100)
Subject: Show the conflicting column in the warning!
X-Git-Tag: rel_0_8_2~69^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8b4f0bc4a4bfdfe612683006cd5086ab599fa4d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Show the conflicting column in the warning!
---

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 7846ac3b20..3644cabc39 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