BUG19584051: Fix comparision of type_code of columns for PEP-249

peeyushgupta · peeyushgupta · commit f985cfc18252 · 2014-09-25T18:01:03.000+05:30
The type_code in cursor.description was not comparing equal
to any of the type objects defined in mysql.connector.dbapi.
We fix the issue by removing __cmp__ and implementing the
rich comparison operators for the PEP-249 class
DBAPITypeObject.

A unit test has been added for BUG#19584051.
diff --git a/lib/mysql/connector/dbapi.py b/lib/mysql/connector/dbapi.py
@@ -36,18 +36,22 @@
 
 from . import constants
 
-class _DBAPITypeObject:
+class _DBAPITypeObject(object):
 
     def __init__(self, *values):
         self.values = values
 
-    def __cmp__(self, other):
+    def __eq__(self, other):
         if other in self.values:
-            return 0
-        if other < self.values:
-            return 1
+            return True
         else:
-            return -1
+            return False
+
+    def __ne__(self, other):
+        if other in self.values:
+            return False
+        else:
+            return True
 
 Date = datetime.date
 Time = datetime.time
@@ -64,8 +68,8 @@ def TimestampFromTicks(ticks):
 
 Binary = bytes
 
-STRING = _DBAPITypeObject(constants.FieldType.get_string_types())
-BINARY = _DBAPITypeObject(constants.FieldType.get_binary_types())
-NUMBER = _DBAPITypeObject(constants.FieldType.get_number_types())
-DATETIME = _DBAPITypeObject(constants.FieldType.get_timestamp_types())
+STRING = _DBAPITypeObject(*constants.FieldType.get_string_types())
+BINARY = _DBAPITypeObject(*constants.FieldType.get_binary_types())
+NUMBER = _DBAPITypeObject(*constants.FieldType.get_number_types())
+DATETIME = _DBAPITypeObject(*constants.FieldType.get_timestamp_types())
 ROWID = _DBAPITypeObject()
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -2867,3 +2867,51 @@ def test_option_files_with_include(self):
 
         os.remove(temp_cnf_file)
         os.remove(temp_include_file)
+
+
+class BugOra19584051(tests.MySQLConnectorTests):
+    """BUG#19584051: TYPE_CODE DOES NOT COMPARE EQUAL
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        self.cursor = self.cnx.cursor()
+
+        self.tbl = 'Bug19584051'
+        self.cursor.execute("DROP TABLE IF EXISTS %s" % self.tbl)
+
+        create = ('CREATE TABLE {0}(col1 INT NOT NULL, col2 BLOB, '
+                  'col3 VARCHAR(10), col4 DECIMAL(4,2), '
+                  'col5 DATETIME , col6 YEAR, '
+                  'PRIMARY KEY(col1))'.format(self.tbl))
+
+        self.cursor.execute(create)
+
+    def tearDown(self):
+        self.cursor.execute("DROP TABLE IF EXISTS %s" % self.tbl)
+        self.cursor.close()
+        self.cnx.close()
+
+    def test_dbapi(self):
+        cur = self.cnx.cursor()
+        sql = ("INSERT INTO {0}(col1, col2, col3, col4, col5, col6) "
+               "VALUES (%s, %s, %s, %s, %s, %s)".format(self.tbl))
+        params = (100, 'blob-data', 'foo', 1.2, datetime(2014, 8, 4, 9, 11, 14),
+                  2014)
+
+        exp = [
+            mysql.connector.NUMBER,
+            mysql.connector.BINARY,
+            mysql.connector.STRING,
+            mysql.connector.NUMBER,
+            mysql.connector.DATETIME,
+            mysql.connector.NUMBER,
+        ]
+        cur.execute(sql, params)
+
+        sql = "SELECT * FROM {0}".format(self.tbl)
+        cur.execute(sql)
+        temp = cur.fetchone()
+        type_codes = [row[1] for row in cur.description]
+        self.assertEqual(exp, type_codes)
+        cur.close()
