diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 13:11:21 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-26 13:11:21 -0400 |
| commit | eb06c142fcc577adb29853d723a0b564a4b68b21 (patch) | |
| tree | 4d58a342062fb4472013c60f653c1e1118a7607f /lib/sqlalchemy/sql/expression.py | |
| parent | 740223d205efed73373e620c13c119986a9c42da (diff) | |
| parent | bfc948e44b15930e566d4afd4340570099af309b (diff) | |
| download | sqlalchemy-eb06c142fcc577adb29853d723a0b564a4b68b21.tar.gz | |
Merge branch 'master' into rel_0_9
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 f0bcd400a..de8f08f9b 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2486,9 +2486,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 |