From 0de5d5c84f5e45e12a8c8a5e10e47bf063bcf793 Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Thu, 23 Jul 2009 04:48:25 +0000 Subject: [PATCH] mysql+zxjdbc guards/allowances --- test/orm/test_generative.py | 2 +- test/orm/test_naturalpks.py | 3 ++- test/sql/test_defaults.py | 4 ++-- test/sql/test_types.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/orm/test_generative.py b/test/orm/test_generative.py index c885f29708..8f61d4d148 100644 --- a/test/orm/test_generative.py +++ b/test/orm/test_generative.py @@ -80,7 +80,7 @@ class GenerativeQueryTest(_base.MappedTest): @testing.resolve_artifact_names def test_aggregate_1(self): - if (testing.against('mysql') and + if (testing.against('mysql') and not testing.against('+zxjdbc') and testing.db.dialect.dbapi.version_info[:4] == (1, 2, 1, 'gamma')): return diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py index b02afb2a55..e99bfb794b 100644 --- a/test/orm/test_naturalpks.py +++ b/test/orm/test_naturalpks.py @@ -310,7 +310,8 @@ class NaturalPKTest(_base.MappedTest): def test_manytomany_passive(self): self._test_manytomany(True) - @testing.fails_on('mysql', 'the executemany() of the association table fails to report the correct row count') + # mysqldb executemany() of the association table fails to report the correct row count + @testing.fails_if(lambda: testing.against('mysql') and not testing.against('+zxjdbc')) def test_manytomany_nonpassive(self): self._test_manytomany(False) diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py index 0d1e96c501..84d30bdb21 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -284,7 +284,7 @@ class DefaultTest(testing.TestBase): @testing.fails_on('firebird', 'Data type unknown') def test_insertmany(self): # MySQL-Python 1.2.2 breaks functions in execute_many :( - if (testing.against('mysql') and + if (testing.against('mysql') and not testing.against('+zxjdbc') and testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)): return @@ -309,7 +309,7 @@ class DefaultTest(testing.TestBase): @testing.fails_on('firebird', 'Data type unknown') def test_updatemany(self): # MySQL-Python 1.2.2 breaks functions in execute_many :( - if (testing.against('mysql') and + if (testing.against('mysql') and not testing.against('+zxjdbc') and testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)): return diff --git a/test/sql/test_types.py b/test/sql/test_types.py index cffb86fdc2..841dda53fe 100644 --- a/test/sql/test_types.py +++ b/test/sql/test_types.py @@ -723,7 +723,7 @@ class IntervalTest(TestBase, AssertsExecutionResults): metadata.drop_all() @testing.fails_on("+pg8000", "Not yet known how to pass values of the INTERVAL type") - @testing.fails_on("+zxjdbc", "Not yet known how to pass values of the INTERVAL type") + @testing.fails_on("postgresql+zxjdbc", "Not yet known how to pass values of the INTERVAL type") def test_roundtrip(self): delta = datetime.datetime(2006, 10, 5) - datetime.datetime(2005, 8, 17) interval_table.insert().execute(interval=delta) -- 2.47.3