Merge branch 'master' into rel_0_9

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index a8705beb4..8e5c94aba 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1995,7 +1995,7 @@ class Constraint(SchemaItem):
             pass
         raise exc.InvalidRequestError(
                     "This constraint is not bound to a table.  Did you "
-                    "mean to call table.add_constraint(constraint) ?")
+                    "mean to call table.append_constraint(constraint) ?")
 
     def _set_parent(self, parent):
         self.parent = parent
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