some pg8000 + postgres fixes

diff --git a/lib/sqlalchemy/test/noseplugin.py b/lib/sqlalchemy/test/noseplugin.py
index f8c1f10a5549da56c978af629e0da74e69937e46..41c3bcdbacae22ea87942364cae6d63788b1919a 100644 (file)
--- 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 <LOG> (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 fb20a351802ab1ef7c70364b00c350736322b700..3136cc9c59505b0506efada21d978b87659242c2 100644 (file)
--- 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 f661b6234d248250aa5a26fa83ed5e31b6fbd0ab..8521a09f6fc1d46f678f9518ac6b9186db02e468 100644 (file)
--- 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()