BUG20106629: Support Django Safetext and SafeBytes type

peeyushgupta · Geert Vanderkelen · commit 990d6010f97a · 2015-03-25T07:34:56.000+01:00
We this fix we support Django SafeText and SafeBytes type fields. A test case has been added for BUG#20106629. (cherry picked from commit 18b69e4)
diff --git a/lib/mysql/connector/django/base.py b/lib/mysql/connector/django/base.py
@@ -98,6 +98,12 @@ def _DATETIME_to_python(self, value, dsc=None):
             dt = dt.replace(tzinfo=timezone.utc)
         return dt
 
+    def _safetext_to_mysql(self, value):
+        return self._str_to_mysql(value)
+
+    def _safebytes_to_mysql(self, value):
+        return self._bytes_to_mysql(value)
+
 
 class CursorWrapper(object):
     """Wrapper around MySQL Connector/Python's cursor class.
diff --git a/tests/test_django.py b/tests/test_django.py
@@ -84,6 +84,7 @@
 if tests.DJANGO_VERSION >= (1, 6):
     from django.db.backends import FieldInfo
 from django.db.backends.signals import connection_created
+from django.utils.safestring import SafeBytes, SafeText
 
 import mysql.connector
 from mysql.connector.django.base import (DatabaseWrapper, DatabaseOperations,
@@ -298,3 +299,25 @@ def test__DATETIME_to_python(self):
         self.assertEqual(None,
                          django_converter._DATETIME_to_python(value, dsc=None))
         settings.USE_TZ = False
+
+
+class BugOra20106629(tests.MySQLConnectorTests):
+    """CONNECTOR/PYTHON DJANGO BACKEND DOESN'T SUPPORT SAFETEXT"""
+    def setUp(self):
+        dbconfig = tests.get_mysql_config()
+        self.conn = mysql.connector.connect(**dbconfig)
+        self.cnx = DatabaseWrapper(settings.DATABASES['default'])
+        self.cur = self.cnx.cursor()
+        self.tbl = "BugOra20106629"
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl), ())
+        self.cur.execute("CREATE TABLE {0}(col1 TEXT, col2 BLOB)".format(self.tbl), ())
+
+    def teardown(self):
+        self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl), ())
+
+    def test_safe_string(self):
+        safe_text = SafeText("dummy & safe data <html> ")
+        safe_bytes = SafeBytes(b"\x00\x00\x4c\x6e\x67\x39")
+        self.cur.execute("INSERT INTO {0} VALUES(%s, %s)".format(self.tbl), (safe_text, safe_bytes))
+        self.cur.execute("SELECT * FROM {0}".format(self.tbl), ())
+        self.assertEqual(self.cur.fetchall(), [(safe_text, safe_bytes)])
