From c1966b488499048cbd5044c4d0b9f2a7680c758d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 12 Jun 2009 16:09:35 +0000 Subject: [PATCH] some pg8000 + postgres fixes --- lib/sqlalchemy/test/noseplugin.py | 3 --- test/dialect/test_postgres.py | 14 +++++++------- test/orm/test_query.py | 1 + 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lib/sqlalchemy/test/noseplugin.py b/lib/sqlalchemy/test/noseplugin.py index f8c1f10a55..41c3bcdbac 100644 --- a/lib/sqlalchemy/test/noseplugin.py +++ b/lib/sqlalchemy/test/noseplugin.py @@ -30,9 +30,6 @@ class NoseSQLAlchemy(Plugin): def options(self, parser, env=os.environ): Plugin.options(self, parser, env) opt = parser.add_option - #opt("--verbose", action="store_true", dest="verbose", - #help="enable stdout echoing/printing") - #opt("--quiet", action="store_true", dest="quiet", help="suppress output") opt("--log-info", action="callback", type="string", callback=_log, help="turn on info logging for (multiple OK)") opt("--log-debug", action="callback", type="string", callback=_log, diff --git a/test/dialect/test_postgres.py b/test/dialect/test_postgres.py index fb20a35180..3136cc9c59 100644 --- a/test/dialect/test_postgres.py +++ b/test/dialect/test_postgres.py @@ -432,7 +432,7 @@ class DomainReflectionTest(TestBase, AssertsExecutionResults): metadata = MetaData(testing.db) table = Table('testtable', metadata, autoload=True) eq_(str(table.columns.answer.server_default.arg), '42', "Reflected default value didn't equal expected value") - self.assertFalse(table.columns.answer.nullable, "Expected reflected column to not be nullable.") + assert not table.columns.answer.nullable, "Expected reflected column to not be nullable." def test_table_is_reflected_test_schema(self): metadata = MetaData(testing.db) @@ -444,13 +444,13 @@ class DomainReflectionTest(TestBase, AssertsExecutionResults): metadata = MetaData(testing.db) table = Table('testtable', metadata, autoload=True, schema='test_schema') eq_(str(table.columns.answer.server_default.arg), '0', "Reflected default value didn't equal expected value") - self.assertTrue(table.columns.answer.nullable, "Expected reflected column to be nullable.") + assert table.columns.answer.nullable, "Expected reflected column to be nullable." def test_crosschema_domain_is_reflected(self): metadata = MetaData(testing.db) table = Table('crosschema', metadata, autoload=True) eq_(str(table.columns.answer.server_default.arg), '0', "Reflected default value didn't equal expected value") - self.assertTrue(table.columns.answer.nullable, "Expected reflected column to be nullable.") + assert table.columns.answer.nullable, "Expected reflected column to be nullable." def test_unknown_types(self): from sqlalchemy.databases import postgres @@ -800,10 +800,10 @@ class ArrayTest(TestBase, AssertsExecutionResults): def test_reflect_array_column(self): metadata2 = MetaData(testing.db) tbl = Table('arrtable', metadata2, autoload=True) - self.assertTrue(isinstance(tbl.c.intarr.type, postgres.PGArray)) - self.assertTrue(isinstance(tbl.c.strarr.type, postgres.PGArray)) - self.assertTrue(isinstance(tbl.c.intarr.type.item_type, Integer)) - self.assertTrue(isinstance(tbl.c.strarr.type.item_type, String)) + assert isinstance(tbl.c.intarr.type, postgres.PGArray) + assert isinstance(tbl.c.strarr.type, postgres.PGArray) + assert isinstance(tbl.c.intarr.type.item_type, Integer) + assert isinstance(tbl.c.strarr.type.item_type, String) def test_insert_array(self): arrtable.insert().execute(intarr=[1,2,3], strarr=['abc', 'def']) diff --git a/test/orm/test_query.py b/test/orm/test_query.py index f661b6234d..8521a09f6f 100644 --- a/test/orm/test_query.py +++ b/test/orm/test_query.py @@ -1726,6 +1726,7 @@ class MixedEntitiesTest(QueryTest): eq_(list(q2), [(u'jack', u'jack', u'jack'), (u'jack', u'jack', u'ed'), (u'jack', u'jack', u'fred'), (u'jack', u'jack', u'chuck'), (u'ed', u'ed', u'jack'), (u'ed', u'ed', u'ed'), (u'ed', u'ed', u'fred'), (u'ed', u'ed', u'chuck')]) @testing.fails_on('mssql', 'FIXME: unknown') + @testing.fails_on('postgres+pg8000', "pg8000 parses the SQL itself before passing on to PG, doesn't parse this") def test_values_with_boolean_selects(self): """Tests a values clause that works with select boolean evaluations""" sess = create_session() -- 2.47.3