diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-04 15:26:28 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-05-04 15:26:28 -0400 |
| commit | c7ce62cf65463c7ea6474d0373c56fb3edeb0e2a (patch) | |
| tree | 32bfd3bbf2630db94b4eece4f00f50ea963146f7 | |
| parent | afcbd7419c0708c63e4d71e634296400db1610c1 (diff) | |
| download | sqlalchemy-c7ce62cf65463c7ea6474d0373c56fb3edeb0e2a.tar.gz | |
- OK we have -w sql passing for: sqlite, postgresql, oursql 2.7 + 3.3, mysqldb 2.7
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 2 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | test/sql/test_types.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index e52aac427..e9645f363 100644 --- 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) @@ -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 a1845778e..dbb475b98 100644 --- 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 |