Remove MYSQLI_TYPE_INTERVAL constant

kamil-tekiela · kamil-tekiela · commit ebb7539a05f5 · 2024-08-20T14:31:18.000+02:00
diff --git a/UPGRADING b/UPGRADING
@@ -879,6 +879,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.
 
 - OpenSSL:
   . The OpenSSL extension now requires at least OpenSSL 1.1.1.
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
@@ -390,11 +390,6 @@
  * @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
diff --git 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
@@ -73,7 +73,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
@@ -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
@@ -330,7 +330,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
 
