diff options
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 | ||||
| -rw-r--r-- | test/sql/test_selectable.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index de8f08f9b..72879f6e4 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2486,7 +2486,7 @@ class ColumnCollection(util.OrderedProperties): existing = self[key] if not existing.shares_lineage(value): util.warn('Column %r on table %r being replaced by ' - '%r , which has the same key. Consider ' + '%r, which has the same key. Consider ' 'use_labels for select() statements.' % (key, getattr(existing, 'table', None), value)) self._all_cols.remove(existing) diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py index e697a7e08..dc0b040b0 100644 --- a/test/sql/test_selectable.py +++ b/test/sql/test_selectable.py @@ -1592,7 +1592,7 @@ class WithLabelsTest(fixtures.TestBase): def _assert_labels_warning(self, s): assert_raises_message( exc.SAWarning, - "replaced by another column with the same key", + r"replaced by Column.*, which has the same key", lambda: s.c ) |