summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-11-02 12:34:55 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-11-02 12:34:55 -0400
commitb746921e78f3890f643ed6581ac01b25f673b476 (patch)
tree715c8f6c9fff708e40d486d14e962f41fa2c5c6a
parent256ae2ad1511d4be25a880ec3ef350689ee98af4 (diff)
downloadsqlalchemy-b746921e78f3890f643ed6581ac01b25f673b476.tar.gz
- [bug] Unicode adjustments allow latest pymysql
(post 0.4) to pass 100% on Python 2.
-rw-r--r--CHANGES3
-rw-r--r--lib/sqlalchemy/dialects/mysql/pymysql.py1
-rw-r--r--test/sql/test_types.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index dfa1f7583..0ffaa8072 100644
--- a/CHANGES
+++ b/CHANGES
@@ -120,6 +120,9 @@ CHANGES
"checkfirst" turned on it only needs to
check for the ENUM once. [ticket:2311]
+- mysql
+ - [bug] Unicode adjustments allow latest pymysql
+ (post 0.4) to pass 100% on Python 2.
0.7.3
=====
diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index dee3dfeaa..04c011211 100644
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -31,6 +31,7 @@ from sqlalchemy.dialects.mysql.mysqldb import MySQLDialect_mysqldb
class MySQLDialect_pymysql(MySQLDialect_mysqldb):
driver = 'pymysql'
+ description_encoding = None
@classmethod
def dbapi(cls):
return __import__('pymysql')
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 987e97f9b..efad45501 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -652,6 +652,7 @@ class UnicodeTest(fixtures.TestBase, AssertsExecutionResults):
('mysql','oursql'),
('mysql','zxjdbc'),
('mysql','mysqlconnector'),
+ ('mysql','pymysql'),
('sqlite','pysqlite'),
('oracle','zxjdbc'),
('oracle','cx_oracle'),