CONPY-88

Extended cursor->description: The descriptor now contains 11 elements: descriptor[8]: table name descriptor[9]: original column name descriptor[10]: original table name
mariadb-corporation · Jan 25, 2022 · 4bcfd6a · 4bcfd6a
1 parent 63c8201
commit 4bcfd6a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/mariadb/mariadb_cursor.c b/mariadb/mariadb_cursor.c
@@ -742,15 +742,18 @@ PyObject *MrdbCursor_description(MrdbCursor *self)
             if (ext_type == EXT_TYPE_JSON)
                 self->fields[i].type= MYSQL_TYPE_JSON;
 
-            if (!(desc= Py_BuildValue("(sIIiIIOI)",
+            if (!(desc= Py_BuildValue("(sIIiIIOIsss)",
                             self->fields[i].name,
                             self->fields[i].type,
                             display_length,
                             packed_len >= 0 ? packed_len : -1,
                             precision,
                             decimals,
                             PyBool_FromLong(!IS_NOT_NULL(self->fields[i].flags)),
-                            self->fields[i].flags)))
+                            self->fields[i].flags,
+                            self->fields[i].table,
+                            self->fields[i].org_name,
+                            self->fields[i].org_table)))
             {
                 Py_XDECREF(obj);
                 mariadb_throw_exception(NULL, Mariadb_OperationalError, 0,

diff --git a/testing/test/integration/test_dbapi20.py b/testing/test/integration/test_dbapi20.py
@@ -284,12 +284,25 @@ def test_description(self):
             self.assertEqual(len(cur.description), 1,
                              'cursor.description describes too many columns'
                              )
-            self.assertEqual(len(cur.description[0]), 8,
-                             'cursor.description[x] tuples must have 8 elements'
+            self.assertEqual(len(cur.description[0]), 11,
+                             'cursor.description[x] tuples must have 11 elements'
                              )
             self.assertEqual(cur.description[0][0].lower(), 'name',
                              'cursor.description[x][0] must return column name'
                              )
+
+            # table name
+            self.assertEqual(cur.description[0][8].lower(), 'dbapi20test_booze',
+                             'cursor.description[x][0] must return column name'
+                             )
+            # original column name
+            self.assertEqual(cur.description[0][9].lower(), 'name',
+                             'cursor.description[x][0] must return column name'
+                             )
+            # original table name
+            self.assertEqual(cur.description[0][10].lower(), 'dbapi20test_booze',
+                             'cursor.description[x][0] must return column name'
+                             )
             self.assertEqual(cur.description[0][1], self.driver.STRING,
                              'cursor.description[x][1] must return column type. Got %r'
                              % cur.description[0][1]