From: Philip Jenvey <pjenvey@underboss.org>
Date: Sat, 13 Mar 2010 18:29:09 +0000 (-0800)
Subject: adjust per a couple zxjdbc failures
X-Git-Tag: rel_0_6beta2~54^2~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e7fcd8798399557494cbed4ff9a5beea0e287e5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjust per a couple zxjdbc failures
---

diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index d007428a7c..7e93962056 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -423,6 +423,7 @@ class TypesTest(TestBase, AssertsCompiledSQL):
         b = bindparam("foo", u"hello world!")
         assert b.type.dialect_impl(dialect).get_dbapi_type(dbapi) == 'STRING'
     
+    @testing.fails_on('+zxjdbc', 'zxjdbc lacks the FIXED_CHAR dbapi type')
     def test_fixed_char(self):
         m = MetaData(testing.db)
         t = Table('t1', m, 
@@ -583,12 +584,12 @@ class TypesTest(TestBase, AssertsCompiledSQL):
             t2 = Table('t', m2, autoload=True)
             assert isinstance(t2.c.data.type, sqltypes.NVARCHAR)
 
-            # nvarchar returns unicode natively.  cx_oracle
-            # _OracleNVarChar type should be at play
-            # here.
-            assert isinstance(
-                        t2.c.data.type.dialect_impl(testing.db.dialect), 
-                        cx_oracle._OracleNVarChar)
+            if testing.against('oracle+cx_oracle'):
+                # nvarchar returns unicode natively.  cx_oracle
+                # _OracleNVarChar type should be at play here.
+                assert isinstance(
+                    t2.c.data.type.dialect_impl(testing.db.dialect), 
+                    cx_oracle._OracleNVarChar)
 
             data = u'm’a réveillé.'
             t2.insert().execute(data=data)