BUG31528783: Fix number with ZEROFILL not handled by C extension

nmariz · nmariz · commit 4db801f74bd9 · 2021-05-26T19:10:43.000+01:00
An exception is raised when a SELECT statement fetch an INT ZEROFILL
data type that will be left 0-padded.

This patch fixes this issue by checking if the ZEROFILL_FLAG flag is
set and passing the base 10 in the PyLong_FromString call used for the
conversion.

A test was added for regression.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -19,6 +19,7 @@ v8.0.26
 - BUG#32740486: Fix typo in docstring
 - BUG#32623479: The X DevAPI returns str for binary types values
 - BUG#32585611: Fix broken links in X DevAPI reference documentation search
+- BUG#31528783: Fix number with ZEROFILL not handled by C extension
 
 v8.0.25
 =======
diff --git a/src/mysql_capi.c b/src/mysql_capi.c
@@ -2669,7 +2669,13 @@ MySQL_fetch_row(MySQL *self)
             field_type == MYSQL_TYPE_LONGLONG ||
             field_type == MYSQL_TYPE_INT24 ||
             field_type == MYSQL_TYPE_YEAR) {
-    		PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 0));
+            if (field_flags && ZEROFILL_FLAG) {
+                PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 10));
+            }
+            else
+            {
+                PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 0));
+            }
         }
         else if (field_type == MYSQL_TYPE_DATETIME ||
                  field_type == MYSQL_TYPE_TIMESTAMP)
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -6265,3 +6265,37 @@ def test_prepared_statement_parameters(self):
             rows = cur.fetchall()
             self.assertEqual(2, len(rows))
         self.cnx.cmd_query(f"DROP TABLE IF EXISTS {self.table_name}")
+
+
+class BugOra31528783(tests.MySQLConnectorTests):
+    """BUG#31528783: ZEROFILL NOT HANDLED BY THE PYTHON CONNECTOR."""
+
+    table_name = "BugOra31528783"
+
+    @foreach_cnx()
+    def test_number_zerofill(self):
+        self.cnx.cmd_query(f"DROP TABLE IF EXISTS {self.table_name}")
+        self.cnx.cmd_query(
+            f"""
+                CREATE TABLE {self.table_name} (
+                    value INT(4) UNSIGNED ZEROFILL NOT NULL,
+                    PRIMARY KEY(value)
+                )
+            """
+        )
+        with self.cnx.cursor() as cur:
+            values = [1, 10, 100, 1000]
+            # Insert data
+            for value in values:
+                cur.execute(
+                    f"INSERT INTO {self.table_name} (value) VALUES ({value})"
+                )
+
+            # Test values
+            for value in values:
+                cur.execute(
+                    f"SELECT value FROM {self.table_name} WHERE value={value}"
+                )
+                res = cur.fetchone()
+                self.assertEqual(res[0], value)
+        self.cnx.cmd_query(f"DROP TABLE IF EXISTS {self.table_name}")
