MySQL 9: Add support for VECTOR type

Author: kamil-tekiela

NEWS

@@ -5,6 +5,10 @@ PHP                                                                        NEWS
 - Core:
   . Exiting a namespace now clears seen symbols. (ilutov)
 
+- Mysqli:
+  . Fixed bug GH-15432 (PHP crashes when processing a MySQL DB query with
+    a new Vector format introduced in MySQL 9.0) (Kamil Tekiela)
+
 15 Aug 2024, PHP 8.4.0beta1
 
 - Core:

UPGRADING

@@ -479,6 +479,8 @@ PHP 8.4 UPGRADE NOTES
     deprecated. As the MYSQLI_STORE_RESULT_COPY_DATA constant was only used in
     conjunction with this function it has also been deprecated.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4#deprecate_the_second_parameter_to_mysqli_store_result
+  . Added support for the new VECTOR data type from MySQL 9. A new constant has
+    been added to mysqli: MYSQLI_TYPE_VECTOR
 
 - PDO_PGSQL:
   . Using escaped question marks (??) inside dollar-quoted strings is deprecated.

ext/mysqli/mysqli.stub.php

@@ -415,13 +415,16 @@
  * @cvalue FIELD_TYPE_GEOMETRY
  */
 const MYSQLI_TYPE_GEOMETRY = UNKNOWN;
-#ifdef FIELD_TYPE_JSON
+/**
+ * @var int
+ * @cvalue FIELD_TYPE_VECTOR
+ */
+const MYSQLI_TYPE_VECTOR = UNKNOWN;
 /**
  * @var int
  * @cvalue FIELD_TYPE_JSON
  */
 const MYSQLI_TYPE_JSON = UNKNOWN;
-#endif
 /**
  * @var int
  * @cvalue FIELD_TYPE_NEWDECIMAL

ext/mysqli/mysqli_arginfo.h

@@ -66,6 +66,8 @@ $expected_constants = array(
     "MYSQLI_TYPE_NEWDATE"				=> true,
     "MYSQLI_TYPE_ENUM"					=> true,
     "MYSQLI_TYPE_SET"					=> true,
+    "MYSQLI_TYPE_VECTOR"			    => true,
+    "MYSQLI_TYPE_JSON"			        => true,
     "MYSQLI_TYPE_TINY_BLOB"				=> true,
     "MYSQLI_TYPE_MEDIUM_BLOB"			=> true,
     "MYSQLI_TYPE_LONG_BLOB"				=> true,
@@ -150,8 +152,6 @@ $expected_constants["MYSQLI_DATA_TRUNCATED"] = true;
 $expected_constants["MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
 $expected_constants["MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS"] = true;
 
-$expected_constants["MYSQLI_TYPE_JSON"]	= true;
-
 $unexpected_constants = array();
 
 foreach ($constants as $group => $consts) {

ext/mysqli/tests/mysqli_constants.phpt

@@ -280,6 +280,7 @@ typedef enum mysqlnd_field_types
 	MYSQL_TYPE_NEWDATE	= 14,
 	MYSQL_TYPE_VARCHAR	= 15,
 	MYSQL_TYPE_BIT		= 16,
+	MYSQL_TYPE_VECTOR=242,
 	MYSQL_TYPE_JSON=245,
 	MYSQL_TYPE_NEWDECIMAL=246,
 	MYSQL_TYPE_ENUM=247,
@@ -322,6 +323,7 @@ typedef enum mysqlnd_server_option
 #define FIELD_TYPE_NEWDATE		MYSQL_TYPE_NEWDATE
 #define FIELD_TYPE_ENUM			MYSQL_TYPE_ENUM
 #define FIELD_TYPE_SET			MYSQL_TYPE_SET
+#define FIELD_TYPE_VECTOR 		MYSQL_TYPE_VECTOR
 #define FIELD_TYPE_JSON 		MYSQL_TYPE_JSON
 #define FIELD_TYPE_TINY_BLOB	MYSQL_TYPE_TINY_BLOB
 #define FIELD_TYPE_MEDIUM_BLOB	MYSQL_TYPE_MEDIUM_BLOB

ext/mysqlnd/mysqlnd_enum_n_def.h

@@ -414,6 +414,10 @@ void _mysqlnd_init_ps_fetch_subsystem(void)
 	mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIMESTAMP].pack_len= MYSQLND_PS_SKIP_RESULT_W_LEN;
 	mysqlnd_ps_fetch_functions[MYSQL_TYPE_TIMESTAMP].php_type= IS_STRING;
 
+	mysqlnd_ps_fetch_functions[MYSQL_TYPE_VECTOR].func		= ps_fetch_string;
+	mysqlnd_ps_fetch_functions[MYSQL_TYPE_VECTOR].pack_len	= MYSQLND_PS_SKIP_RESULT_STR;
+	mysqlnd_ps_fetch_functions[MYSQL_TYPE_VECTOR].php_type	= IS_STRING;
+
 	mysqlnd_ps_fetch_functions[MYSQL_TYPE_JSON].func	= ps_fetch_string;
 	mysqlnd_ps_fetch_functions[MYSQL_TYPE_JSON].pack_len= MYSQLND_PS_SKIP_RESULT_STR;
 	mysqlnd_ps_fetch_functions[MYSQL_TYPE_JSON].php_type = IS_STRING;

ext/mysqlnd/mysqlnd_ps_codec.c

@@ -1468,6 +1468,7 @@ php_mysqlnd_rowp_read_binary_protocol(MYSQLND_ROW_BUFFER * row_buffer, zval * fi
 					case MYSQL_TYPE_MEDIUM_BLOB:statistic = STAT_BINARY_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_LONG_BLOB:	statistic = STAT_BINARY_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_BLOB:		statistic = STAT_BINARY_TYPE_FETCHED_BLOB; break;
+					case MYSQL_TYPE_VECTOR:		statistic = STAT_BINARY_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_VAR_STRING:	statistic = STAT_BINARY_TYPE_FETCHED_STRING; break;
 					case MYSQL_TYPE_STRING:		statistic = STAT_BINARY_TYPE_FETCHED_STRING; break;
 					case MYSQL_TYPE_GEOMETRY:	statistic = STAT_BINARY_TYPE_FETCHED_GEOMETRY; break;
@@ -1553,6 +1554,7 @@ php_mysqlnd_rowp_read_text_protocol(MYSQLND_ROW_BUFFER * row_buffer, zval * fiel
 					case MYSQL_TYPE_MEDIUM_BLOB:statistic = STAT_TEXT_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_LONG_BLOB:	statistic = STAT_TEXT_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_BLOB:		statistic = STAT_TEXT_TYPE_FETCHED_BLOB; break;
+					case MYSQL_TYPE_VECTOR:		statistic = STAT_TEXT_TYPE_FETCHED_BLOB; break;
 					case MYSQL_TYPE_VAR_STRING:	statistic = STAT_TEXT_TYPE_FETCHED_STRING; break;
 					case MYSQL_TYPE_STRING:		statistic = STAT_TEXT_TYPE_FETCHED_STRING; break;
 					case MYSQL_TYPE_GEOMETRY:	statistic = STAT_TEXT_TYPE_FETCHED_GEOMETRY; break;