From c290996db6058eb49b8c28bb0ec1cdaac85275a4 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Tue, 20 Aug 2024 14:30:56 +0200 Subject: [PATCH] Remove MYSQLI_TYPE_INTERVAL constant --- UPGRADING | 4 ++++ ext/mysqli/mysqli.stub.php | 5 ----- ext/mysqli/mysqli_arginfo.h | 3 +-- ext/mysqli/tests/bug_mysql_49406.phpt | 1 - ext/mysqli/tests/mysqli_constants.phpt | 1 - ext/mysqli/tests/mysqli_fetch_field_types.phpt | 1 - ext/mysqlnd/mysqlnd_enum_n_def.h | 1 - 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/UPGRADING b/UPGRADING index 4dbef51a65f..48740ce4341 100644 --- a/UPGRADING +++ b/UPGRADING @@ -882,6 +882,10 @@ PHP 8.4 UPGRADE NOTES . The MYSQLI_CURSOR_TYPE_FOR_UPDATE and MYSQLI_CURSOR_TYPE_SCROLLABLE constants have been removed. This functionality was never implemented, neither with mysqlnd nor with libmysql. + . The unused MYSQLI_TYPE_INTERVAL constant, which is currently a stub + and an alias for MYSQLI_TYPE_ENUM, has been removed. There are no + plans to add such data type to MySQL yet, so it's unclear what its value + would finally be. . A new constant has been added: MYSQLI_TYPE_VECTOR. - Mysqlnd diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php index dbed931c939..9b98369600e 100644 --- a/ext/mysqli/mysqli.stub.php +++ b/ext/mysqli/mysqli.stub.php @@ -390,11 +390,6 @@ const MYSQLI_TYPE_STRING = UNKNOWN; * @cvalue FIELD_TYPE_CHAR */ const MYSQLI_TYPE_CHAR = UNKNOWN; -/** - * @var int - * @cvalue FIELD_TYPE_INTERVAL - */ -const MYSQLI_TYPE_INTERVAL = UNKNOWN; /** * @var int * @cvalue FIELD_TYPE_GEOMETRY diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h index 2a66413c801..223fe9b7f8c 100644 --- a/ext/mysqli/mysqli_arginfo.h +++ b/ext/mysqli/mysqli_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ff768a152d4ee91b184999d351ce39a7d0bfef46 */ + * Stub hash: 245640045ed8172d7772b708787c400f29bb607b */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING) ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0) @@ -1116,7 +1116,6 @@ static void register_mysqli_symbols(int module_number) REGISTER_LONG_CONSTANT("MYSQLI_TYPE_VAR_STRING", FIELD_TYPE_VAR_STRING, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_STRING", FIELD_TYPE_STRING, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_CHAR", FIELD_TYPE_CHAR, CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_VECTOR", FIELD_TYPE_VECTOR, CONST_PERSISTENT); #if defined(FIELD_TYPE_JSON) diff --git a/ext/mysqli/tests/bug_mysql_49406.phpt b/ext/mysqli/tests/bug_mysql_49406.phpt index f9dd11b619b..09cc544a12b 100644 --- a/ext/mysqli/tests/bug_mysql_49406.phpt +++ b/ext/mysqli/tests/bug_mysql_49406.phpt @@ -58,7 +58,6 @@ require_once 'skipifconnectfailure.inc'; MYSQLI_TYPE_STRING => "STRING", MYSQLI_TYPE_NULL => "NULL", MYSQLI_TYPE_NEWDATE => "NEWDATE", - MYSQLI_TYPE_INTERVAL => "INTERVAL", MYSQLI_TYPE_GEOMETRY => "GEOMETRY", ); diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index 1e51e0c92b0..982fe47f75c 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -75,7 +75,6 @@ $expected_constants = array( "MYSQLI_TYPE_VAR_STRING" => true, "MYSQLI_TYPE_STRING" => true, "MYSQLI_TYPE_CHAR" => true, - "MYSQLI_TYPE_INTERVAL" => true, "MYSQLI_TYPE_GEOMETRY" => true, "MYSQLI_NO_DATA" => true, "MYSQLI_REPORT_INDEX" => true, diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index 041eb16694a..0b810abc3a8 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -92,7 +92,6 @@ require_once 'skipifconnectfailure.inc'; MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'smash'), MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL - TODO add testing', MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE - TODO add testing', - MYSQLI_TYPE_INTERVAL => 'MYSQLI_TYPE_INTERVAL - TODO add testing', MYSQLI_TYPE_GEOMETRY => 'MYSQLI_TYPE_GEOMETRY - TODO add testing', ); diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 5739979ecca..15db002aa73 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -332,7 +332,6 @@ typedef enum mysqlnd_server_option #define FIELD_TYPE_VAR_STRING MYSQL_TYPE_VAR_STRING #define FIELD_TYPE_STRING MYSQL_TYPE_STRING #define FIELD_TYPE_CHAR MYSQL_TYPE_TINY -#define FIELD_TYPE_INTERVAL MYSQL_TYPE_ENUM #define FIELD_TYPE_GEOMETRY MYSQL_TYPE_GEOMETRY #define FIELD_TYPE_BIT MYSQL_TYPE_BIT