diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-08-18 05:28:05 +0000 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-08-18 05:28:05 +0000 |
| commit | fc59a5e0c4731a29cc3e4852bc3629850e0c9a04 (patch) | |
| tree | 99058e0d0e021f40b4e18ef0d3b919b644b17819 /test/sql | |
| parent | f465044d262dbbee8b5f3798822d41d79301735a (diff) | |
| download | sqlalchemy-fc59a5e0c4731a29cc3e4852bc3629850e0c9a04.tar.gz | |
oracle+zxjdbc returning support
Diffstat (limited to 'test/sql')
| -rw-r--r-- | test/sql/test_query.py | 6 | ||||
| -rw-r--r-- | test/sql/test_returning.py | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/test/sql/test_query.py b/test/sql/test_query.py index 934bdadbe..3222ff6ef 100644 --- a/test/sql/test_query.py +++ b/test/sql/test_query.py @@ -80,8 +80,7 @@ class QueryTest(TestBase): ret[c.key] = row[c] return ret - if (testing.against('firebird', 'postgresql', 'oracle', 'mssql') and - not testing.against('oracle+zxjdbc')): + if testing.against('firebird', 'postgresql', 'oracle', 'mssql'): test_engines = [ engines.testing_engine(options={'implicit_returning':False}), engines.testing_engine(options={'implicit_returning':True}), @@ -168,8 +167,7 @@ class QueryTest(TestBase): eq_(r.inserted_primary_key, [12, 1]) def test_autoclose_on_insert(self): - if (testing.against('firebird', 'postgresql', 'oracle', 'mssql') and - not testing.against('oracle+zxjdbc')): + if testing.against('firebird', 'postgresql', 'oracle', 'mssql'): 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 474e0b369..02d906dd8 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', 'oracle+zxjdbc') + __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access') def setup(self): meta = MetaData(testing.db) @@ -61,6 +61,7 @@ class ReturningTest(TestBase, AssertsExecutionResults): assert row['lala'] == 6 @testing.fails_on('firebird', "fb/kintersbasdb can't handle the bind params") + @testing.fails_on('oracle+zxjdbc', "JDBC driver bug") @testing.exclude('firebird', '<', (2, 0), '2.0+ feature') @testing.exclude('postgresql', '<', (8, 2), '8.3+ feature') def test_anon_expressions(self): @@ -92,6 +93,8 @@ class ReturningTest(TestBase, AssertsExecutionResults): eq_(result.fetchall(), [(1,)]) + @testing.crashes('oracle+zxjdbc', 'Triggers a "No more data to read from socket" and ' + 'prevents table from being dropped') @testing.fails_on('postgresql', '') @testing.fails_on('oracle', '') def test_executemany(): @@ -109,7 +112,8 @@ class ReturningTest(TestBase, AssertsExecutionResults): test_executemany() result3 = table.insert().returning(table.c.id).execute({'persons': 4, 'full': False}) - eq_([dict(row) for row in result3], [{'id': 4}]) + next = testing.against('oracle+zxjdbc') and 2 or 4 + eq_([dict(row) for row in result3], [{'id': next}]) @testing.exclude('firebird', '<', (2, 1), '2.1+ feature') @@ -137,7 +141,7 @@ class ReturningTest(TestBase, AssertsExecutionResults): eq_(result2.fetchall(), [(2,False),]) class SequenceReturningTest(TestBase): - __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'mssql', 'oracle+zxjdbc') + __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'mssql') def setup(self): meta = MetaData(testing.db) @@ -160,7 +164,7 @@ class SequenceReturningTest(TestBase): class KeyReturningTest(TestBase, AssertsExecutionResults): """test returning() works with columns that define 'key'.""" - __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access', 'oracle+zxjdbc') + __unsupported_on__ = ('sqlite', 'mysql', 'maxdb', 'sybase', 'access') def setup(self): meta = MetaData(testing.db) |