o oracle+zxjdbc type handling additions

o avoid returning tests on oracle+zxjdbc for now

3 files changed, 10 insertions, 6 deletions

diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index 444f24cf2..85c3097be 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -14,7 +14,7 @@ import os
 
 
 class OutParamTest(TestBase, AssertsExecutionResults):
-    __only_on__ = 'oracle'
+    __only_on__ = 'oracle+cx_oracle'
 
     @classmethod
     def setup_class(cls):
@@ -364,6 +364,7 @@ class TypesTest(TestBase, AssertsCompiledSQL):
         ]:
             assert isinstance(start.dialect_impl(dialect), test), "wanted %r got %r" % (test, start.dialect_impl(dialect))
 
+    @testing.requires.returning
     def test_int_not_float(self):
         m = MetaData(testing.db)
         t1 = Table('t1', m, Column('foo', Integer))
@@ -421,6 +422,7 @@ class TypesTest(TestBase, AssertsCompiledSQL):
         finally:
             testing.db.execute("DROP TABLE Z_TEST")
 
+    @testing.fails_on('+zxjdbc', 'auto_convert_lobs not applicable')
     def test_raw_lobs(self):
         engine = testing_engine(options=dict(auto_convert_lobs=False))
         metadata = MetaData()
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 0e3b9dff2..d10313d14 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -80,7 +80,8 @@ class QueryTest(TestBase):
                     ret[c.key] = row[c]
             return ret
 
-        if testing.against('firebird', 'postgresql', 'oracle', 'mssql'):
+        if (testing.against('firebird', 'postgresql', 'oracle', 'mssql') and
+            not testing.against('oracle+zxjdbc')):
             test_engines = [
                 engines.testing_engine(options={'implicit_returning':False}),
                 engines.testing_engine(options={'implicit_returning':True}),
@@ -167,7 +168,8 @@ class QueryTest(TestBase):
         eq_(r.inserted_primary_key, [12, 1])
 
     def test_autoclose_on_insert(self):
-        if testing.against('firebird', 'postgresql', 'oracle', 'mssql'):
+        if (testing.against('firebird', 'postgresql', 'oracle', 'mssql') and
+            not testing.against('oracle+zxjdbc')):
             test_engines = [
                 engines.testing_engine(options={'implicit_returning':False}),
                 engines.testing_engine(options={'implicit_returning':True}),
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 1b69c55ff..474e0b369 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -5,7 +5,7 @@ from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.types import TypeDecorator
 
 class ReturningTest(TestBase, AssertsExecutionResults):
-    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access')
+    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'oracle+zxjdbc')
 
     def setup(self):
         meta = MetaData(testing.db)
@@ -137,7 +137,7 @@ class ReturningTest(TestBase, AssertsExecutionResults):
         eq_(result2.fetchall(), [(2,False),])
 
 class SequenceReturningTest(TestBase):
-    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'mssql')
+    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'mssql', 'oracle+zxjdbc')
 
     def setup(self):
         meta = MetaData(testing.db)
@@ -160,7 +160,7 @@ class SequenceReturningTest(TestBase):
 class KeyReturningTest(TestBase, AssertsExecutionResults):
     """test returning() works with columns that define 'key'."""
     
-    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access')
+    __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'oracle+zxjdbc')
 
     def setup(self):
         meta = MetaData(testing.db)