- Fixed unicode support for PyMySQL when using an "executemany"

operation with unicode parameters.  SQLAlchemy now passes both
the statement as well as the bound parameters as unicode
objects, as PyMySQL generally uses string interpolation
internally to produce the final statement, and in the case of
executemany does the "encode" step only on the final statement.
fixes #3337

(cherry picked from commit dcf5408f7d315b4d9ddec5d0d696eb364d763099)

Conflicts:
	lib/sqlalchemy/dialects/mysql/pymysql.py

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 3c38de454922664b9a6563106ce94e8797b818c9..53c4eeaaaba2ccb4b47201e1d848f4f43ab9ba38 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,18 @@
 .. changelog::
     :version: 0.9.10
 
+    .. change::
+        :tags: bug, mysql, pymysql
+        :tickets: 3337
+        :versions: 1.0.0b4
+
+        Fixed unicode support for PyMySQL when using an "executemany"
+        operation with unicode parameters.  SQLAlchemy now passes both
+        the statement as well as the bound parameters as unicode
+        objects, as PyMySQL generally uses string interpolation
+        internally to produce the final statement, and in the case of
+        executemany does the "encode" step only on the final statement.
+
     .. change::
         :tags: bug, py3k, mysql
         :tickets: 3333

diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index c4b953fab6e976a9760bb6c8e7de9d45f5972afa..96650f935541d0229b11ad918788b6d00a575e28 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -31,8 +31,12 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb):
     driver = 'pymysql'
 
     description_encoding = None
-    if py3k:
-        supports_unicode_statements = True
+
+    # generally, these two values should be both True
+    # or both False.   PyMySQL unicode tests pass all the way back
+    # to 0.4 either way.  See [ticket:3337]
+    supports_unicode_statements = True
+    supports_unicode_binds = True
 
     @classmethod
     def dbapi(cls):

diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index fd7dafc84406e190593ae9f7c8e2cec64353962a..5469567a71029e74f686f6d95c4f5aafceee09cd 100644 (file)
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -931,6 +931,7 @@ class UnicodeTest(fixtures.TestBase):
                     ('postgresql', 'pypostgresql'),
                     ('postgresql', 'pg8000'),
                     ('postgresql', 'zxjdbc'),
+                    ('mysql', 'pymysql'),
                     ('mysql', 'oursql'),
                     ('mysql', 'zxjdbc'),
                     ('mysql', 'mysqlconnector'),