From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 5 Dec 2014 00:12:52 +0000 (-0500)
Subject: - Updated the "supports_unicode_statements" flag to True for MySQLdb
X-Git-Tag: rel_1_0_0b1~189^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fda589487b2cb60e8d69f520e0120eeb7c875915;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Updated the "supports_unicode_statements" flag to True for MySQLdb
and Pymysql under Python 2.   This refers to the SQL statements
themselves, not the parameters, and affects issues such as table
and column names using non-ASCII characters.   These drivers both
appear to support Python 2 Unicode objects without issue in modern
versions.
fixes #3121
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index f90ae40f81..7126d0930e 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -22,6 +22,17 @@
     series as well.  For changes that are specific to 1.0 with an emphasis
     on compatibility concerns, see :doc:`/changelog/migration_10`.
 
+    .. change::
+        :tags: feature, mysql
+        :tickets: 3121
+
+        Updated the "supports_unicode_statements" flag to True for MySQLdb
+        and Pymysql under Python 2.   This refers to the SQL statements
+        themselves, not the parameters, and affects issues such as table
+        and column names using non-ASCII characters.   These drivers both
+        appear to support Python 2 Unicode objects without issue in modern
+        versions.
+
     .. change::
         :tags: bug, mysql
         :tickets: 3263
diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index 73210d67a1..893c6a9e2e 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -77,7 +77,7 @@ class MySQLIdentifierPreparer_mysqldb(MySQLIdentifierPreparer):
 
 class MySQLDialect_mysqldb(MySQLDialect):
     driver = 'mysqldb'
-    supports_unicode_statements = False
+    supports_unicode_statements = True
     supports_sane_rowcount = True
     supports_sane_multi_rowcount = True
 
diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index 31226cea05..8df2ba03fd 100644
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -31,8 +31,7 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb):
     driver = 'pymysql'
 
     description_encoding = None
-    if py3k:
-        supports_unicode_statements = True
+    supports_unicode_statements = True
 
     @classmethod
     def dbapi(cls):