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 | |
| parent | 740223d205efed73373e620c13c119986a9c42da (diff) | |
| parent | bfc948e44b15930e566d4afd4340570099af309b (diff) | |
| download | sqlalchemy-eb06c142fcc577adb29853d723a0b564a4b68b21.tar.gz | |
Merge branch 'master' into rel_0_9
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/schema.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 | ||||
| -rw-r--r-- | test/dialect/test_postgresql.py | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 875c070d9..e04e53b46 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ dogpile_data/ *.orig tox.ini .venv -.egg-info +*.egg-info .coverage -.*,cover
\ No newline at end of file +.*,cover +*.so 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 diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py index 90a09d362..8568f6add 100644 --- a/test/dialect/test_postgresql.py +++ b/test/dialect/test_postgresql.py @@ -23,6 +23,7 @@ from sqlalchemy import util from sqlalchemy.testing.util import round_decimal from sqlalchemy.sql import table, column, operators import logging +import logging.handlers import re class SequenceTest(fixtures.TestBase, AssertsCompiledSQL): |