Define MYSQL_TYPE_VECTOR in the C-ext when compiling with MySQL C API older than 9.0

oscpache · oscpache · commit 89e497499f39 · 2024-03-07T10:39:11.000-06:00
Change-Id: I88d1d7cad47266577ebbe000564b6c6e7a10f610
diff --git a/mysql-connector-python/src/mysql_capi.c b/mysql-connector-python/src/mysql_capi.c
@@ -73,6 +73,11 @@ MySQL_connected(MySQL *self);
 #define VERSION_OFFSET_MAJOR 10000
 #define VERSION_OFFSET_MINOR 100
 
+// Making sure MYSQL_TYPE_VECTOR is always defined
+#if MYSQL_VERSION_ID < 90000
+#define MYSQL_TYPE_VECTOR 242
+#endif
+
 // Python FIDO messages callback
 static PyObject *fido_callback = NULL;
 
@@ -2782,11 +2787,7 @@ MySQL_fetch_row(MySQL *self)
         else if (field_type == MYSQL_TYPE_BIT) {
             PyTuple_SET_ITEM(result_row, i, mytopy_bit(row[i], field_lengths[i]));
         }
-    #if MYSQL_VERSION_ID >= 90000
-        else if (field_type == MYSQL_TYPE_BLOB || field_type == MYSQL_TYPE_VECTOR)
-    #else
-        else if (field_type == MYSQL_TYPE_BLOB)
-    #endif
+    else if (field_type == MYSQL_TYPE_BLOB || field_type == MYSQL_TYPE_VECTOR)
         {
             if ((field_flags & BLOB_FLAG) &&
                 (field_flags & BINARY_FLAG) && field_charsetnr == 63) {
@@ -3715,7 +3716,7 @@ MySQLPrepStmt_fetch_row(MySQLPrepStmt *self)
                 break;
             /* MYSQL_TYPE_CHAR, MYSQL_TYPE_VARCHAR, MYSQL_TYPE_STRING, */
             /* MYSQL_TYPE_VAR_STRING, MYSQL_TYPE_GEOMETRY, MYSQL_TYPE_BLOB */
-            /* MYSQL_TYPE_ENUM, MYSQL_TYPE_SET or MYSQL_TYPE_BIT */
+            /* MYSQL_TYPE_ENUM, MYSQL_TYPE_SET, MYSQL_TYPE_VECTOR or MYSQL_TYPE_BIT */
             default:
                 if (field_flags & SET_FLAG) { /* MYSQL_TYPE_SET */
                     char *rest = NULL;
