diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2013-05-26 07:46:16 -0700 |
|---|---|---|
| committer | mike bayer <mike_mp@zzzcomputing.com> | 2013-05-26 07:46:16 -0700 |
| commit | bfc948e44b15930e566d4afd4340570099af309b (patch) | |
| tree | 84cee5cc407d63c633e88a21c4010834a4c41d03 /lib/sqlalchemy/sql/expression.py | |
| parent | 07d200166aa44532e41ac82640eb372f92b00b9f (diff) | |
| parent | 3406deac19e5f86ce4d09b8acd6f4aff433206c9 (diff) | |
| download | sqlalchemy-bfc948e44b15930e566d4afd4340570099af309b.tar.gz | |
Merge pull request #1 from cjw296/small-fixes
Small fixes
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 |