minor update regarding unicode unescaping

stamparm · stamparm · commit 300abc2ba24f · 2012-01-01T22:31:09.000Z
diff --git a/plugins/dbms/mysql/syntax.py b/plugins/dbms/mysql/syntax.py
@@ -22,7 +22,10 @@ def unescape(expression, quote=True):
         if quote:
             unescaped = expression
             for item in re.findall(r"'[^']+'", expression, re.S):
-                unescaped = unescaped.replace(item, "0x%s" % binascii.hexlify(item.strip("'")))
+                try:
+                    unescaped = unescaped.replace(item, "0x%s" % binascii.hexlify(item.strip("'")))
+                except UnicodeEncodeError:
+                    unescaped = unescaped.replace(item, "CHAR(0x%s USING utf8)" % "".join(("%.2x" % ord(_)) if ord(_) < 256 else ("%.4x" % ord(_)) for _ in item.strip("'")))
         else:
             unescaped = "0x%s" % binascii.hexlify(expression)
 
