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 /lib/sqlalchemy/test | |
| parent | f465044d262dbbee8b5f3798822d41d79301735a (diff) | |
| download | sqlalchemy-fc59a5e0c4731a29cc3e4852bc3629850e0c9a04.tar.gz | |
oracle+zxjdbc returning support
Diffstat (limited to 'lib/sqlalchemy/test')
| -rw-r--r-- | lib/sqlalchemy/test/assertsql.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/test/requires.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/test/assertsql.py b/lib/sqlalchemy/test/assertsql.py index 1af28794e..6dbc95b78 100644 --- a/lib/sqlalchemy/test/assertsql.py +++ b/lib/sqlalchemy/test/assertsql.py @@ -216,6 +216,9 @@ class AllOf(AssertRule): return len(self.rules) == 0 def _process_engine_statement(query, context): + if util.jython: + # oracle+zxjdbc passes a PyStatement when returning into + query = unicode(query) if context.engine.name == 'mssql' and query.endswith('; select scope_identity()'): query = query[:-25] diff --git a/lib/sqlalchemy/test/requires.py b/lib/sqlalchemy/test/requires.py index c1f8d3168..f3f4ec191 100644 --- a/lib/sqlalchemy/test/requires.py +++ b/lib/sqlalchemy/test/requires.py @@ -140,7 +140,6 @@ def returning(fn): no_support('maxdb', 'not supported by database'), no_support('sybase', 'not supported by database'), no_support('informix', 'not supported by database'), - no_support('oracle+zxjdbc', 'FIXME: tricky; currently broken'), ) def two_phase_transactions(fn): |