From e8b4f0bc4a4bfdfe612683006cd5086ab599fa4d Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Wed, 22 May 2013 08:38:44 +0100 Subject: [PATCH] Show the conflicting column in the warning! --- lib/sqlalchemy/sql/expression.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.47.3