diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-08-09 00:56:52 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-08-09 00:56:52 +0000 |
| commit | a53d4e2ab48a003a957ba374c65ea999dcd962e4 (patch) | |
| tree | 5fe59c06d9895a81a7682262ec4e02112ba8194d /test/sql | |
| parent | f0b848c86f62ab457fc3e2aba3d161d4334d861d (diff) | |
| download | sqlalchemy-a53d4e2ab48a003a957ba374c65ea999dcd962e4.tar.gz | |
o oracle+zxjdbc type handling additions
o avoid returning tests on oracle+zxjdbc for now
Diffstat (limited to 'test/sql')
| -rw-r--r-- | test/sql/test_query.py | 6 | ||||
| -rw-r--r-- | test/sql/test_returning.py | 6 |
2 files changed, 7 insertions, 5 deletions
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) |