summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-12-04 19:12:52 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-12-04 19:12:52 -0500
commitfda589487b2cb60e8d69f520e0120eeb7c875915 (patch)
tree0b2373c3d5f3d2ae41206518f956d879147f42a7
parentf5ff86983f9cc7914a89b96da1fd2638677d345b (diff)
downloadsqlalchemy-fda589487b2cb60e8d69f520e0120eeb7c875915.tar.gz
- 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
-rw-r--r--doc/build/changelog/changelog_10.rst11
-rw-r--r--lib/sqlalchemy/dialects/mysql/mysqldb.py2
-rw-r--r--lib/sqlalchemy/dialects/mysql/pymysql.py3
3 files changed, 13 insertions, 3 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index f90ae40f8..7126d0930 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -23,6 +23,17 @@
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 73210d67a..893c6a9e2 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 31226cea0..8df2ba03f 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):