From d630a2e6ef7031745509b641cdd9f81385c37d56 Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Sat, 18 May 2013 08:51:24 +0100 Subject: Add missing import that caused test_notice_logging to fail if this suite was run on its own. --- test/dialect/test_postgresql.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/dialect/test_postgresql.py b/test/dialect/test_postgresql.py index e217eb0b8..4fd5bc9c1 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): -- cgit v1.2.1 From f5956fae6a67868ea89dd1518f380fb8264acc34 Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Tue, 21 May 2013 17:46:28 +0100 Subject: fix incorrect method name --- lib/sqlalchemy/schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 9a07b9de4..f894e6c31 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -2007,7 +2007,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 -- cgit v1.2.1 From e8b4f0bc4a4bfdfe612683006cd5086ab599fa4d Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Wed, 22 May 2013 08:38:44 +0100 Subject: Show the conflicting column in the warning! --- lib/sqlalchemy/sql/expression.py | 4 ++-- 1 file 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 -- cgit v1.2.1 From 3406deac19e5f86ce4d09b8acd6f4aff433206c9 Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Sun, 26 May 2013 14:49:42 +0100 Subject: tweaks to ignores --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 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 -- cgit v1.2.1 From 07d200166aa44532e41ac82640eb372f92b00b9f Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Sun, 26 May 2013 10:10:22 -0400 Subject: - fixing AbstractConcreteBase import in docstring, [ticket:2717] --- lib/sqlalchemy/ext/declarative/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index 6f3ffddc7..2f222f682 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -308,7 +308,7 @@ class AbstractConcreteBase(ConcreteBase): Example:: - from sqlalchemy.ext.declarative import ConcreteBase + from sqlalchemy.ext.declarative import AbstractConcreteBase class Employee(AbstractConcreteBase, Base): pass -- cgit v1.2.1