- OK we have -w sql passing for: sqlite, postgresql, oursql 2.7 + 3.3, mysqldb 2.7

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index e52aac427c96aa5f537e8d9eb7b3c0b2d42be0ff..e9645f36391ebb289fcbb14d974e9b5a613b588c 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -221,7 +221,7 @@ class DefaultDialect(interfaces.Dialect):
                     )
                     row = cursor.fetchone()
 
-                    return isinstance(row[0], util.string_types)
+                    return isinstance(row[0], util.text_type)
                 except self.dbapi.Error as de:
                     util.warn("Exception attempting to "
                             "detect unicode returns: %r" % de)

diff --git a/setup.cfg b/setup.cfg
index 92bdbc40f4c8dc17c1341bd43bbf8a40ae1863ef..9c53e32ad1742c5ae56d7128d1ceff310c4b1dfb 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,7 @@ pg8000=postgresql+pg8000://scott:tiger@127.0.0.1:5432/test
 postgresql_jython=postgresql+zxjdbc://scott:tiger@127.0.0.1:5432/test
 mysql_jython=mysql+zxjdbc://scott:tiger@127.0.0.1:5432/test
 mysql=mysql://scott:tiger@127.0.0.1:3306/test
+oursql=mysql+oursql://scott:tiger@127.0.0.1:3306/test
 pymysql=mysql+pymysql://scott:tiger@127.0.0.1:3306/test?use_unicode=0&charset=utf8
 oracle=oracle://scott:tiger@127.0.0.1:1521
 oracle8=oracle://scott:tiger@127.0.0.1:1521/?use_ansi=0

diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index a1845778e58eb82681fbd0f92454468a57a86f6f..dbb475b98c8f770f71599926b55a027ca5edd573 100644 (file)
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1349,7 +1349,7 @@ class NumericRawSQLTest(fixtures.TestBase):
         metadata = self.metadata
         self._fixture(metadata, Integer, 45)
         val = testing.db.execute("select val from t").scalar()
-        assert isinstance(val, int)
+        assert isinstance(val, util.int_types)
         eq_(val, 45)
 
     @testing.provide_metadata