Merge branch 'BUG19803702' into develop

peeyushgupta · peeyushgupta · commit b0c02e51d45a · 2014-11-14T12:08:06.000+05:30
diff --git a/lib/mysql/connector/errors.py b/lib/mysql/connector/errors.py
@@ -26,6 +26,7 @@
 
 from . import utils
 from .locales import get_client_error
+from .catch23 import PY2
 
 # _CUSTOM_ERROR_EXCEPTIONS holds custom exceptions and is ued by the
 # function custom_error_exception. _ERROR_EXCEPTIONS (at bottom of module)
@@ -187,7 +188,7 @@ def __init__(self, msg=None, errno=None, values=None, sqlstate=None):
         if self.msg and self.errno != -1:
             fields = {
                 'errno': self.errno,
-                'msg': self.msg
+                'msg': self.msg.encode('utf8') if PY2 else self.msg
             }
             if self.sqlstate:
                 fmt = '{errno} ({state}): {msg}'
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -3209,3 +3209,26 @@ def test_compress(self):
             cnx1.close()
         except:
             self.fail("Reset session with compression test failed.")
+
+
+class BugOra19803702(tests.MySQLConnectorTests):
+    """BUG#19803702: CAN'T REPORT ERRORS THAT HAVE NON-ASCII CHARACTERS
+    """
+    def test_errors(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        self.cur = self.cnx.cursor()
+
+        self.tbl = 'áááëëëááá'
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
+        create = ("CREATE TABLE {0} (col1 VARCHAR(10), col2 INT) "
+                  "DEFAULT CHARSET latin1".format(self.tbl))
+
+        self.cur.execute(create)
+        self.assertRaises(errors.DatabaseError, self.cur.execute, create)
+
+    def tearDown(self):
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
+        self.cur.close()
+        self.cnx.close()
