fix parameterized execute()

nakagami · Feb 16, 2013 · 330818e · 330818e
1 parent 991fd8e
commit 330818e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cymysql/cursors.py b/cymysql/cursors.py
@@ -90,6 +90,11 @@ def execute(self, query, args=None):
 
         # TODO: make sure that conn.escape is correct
 
+        if PYTHON3 and (not isinstance(query, str)):
+            query = query.decode(charset)
+        if (not PYTHON3) and isinstance(query, unicode):
+            query = query.encode(charset)
+
         if args is not None:
             if isinstance(args, tuple) or isinstance(args, list):
                 escaped_args = tuple(conn.escape(arg) for arg in args)
@@ -102,9 +107,6 @@ def execute(self, query, args=None):
 
             query = query % escaped_args
 
-        if PYTHON3 or isinstance(query, unicode):
-            query = query.encode(charset)
-
         result = 0
         try:
             result = self._query(query)

diff --git a/cymysql/cursorsx.pyx b/cymysql/cursorsx.pyx
@@ -90,6 +90,11 @@ class Cursor(object):
 
         # TODO: make sure that conn.escape is correct
 
+        if PYTHON3 and (not isinstance(query, str)):
+            query = query.decode(charset)
+        if (not PYTHON3) and isinstance(query, unicode):
+            query = query.encode(charset)
+
         if args is not None:
             if isinstance(args, tuple) or isinstance(args, list):
                 escaped_args = tuple(conn.escape(arg) for arg in args)
@@ -102,9 +107,6 @@ class Cursor(object):
 
             query = query % escaped_args
 
-        if PYTHON3 or isinstance(query, unicode):
-            query = query.encode(charset)
-
         result = 0
         try:
             result = self._query(query)