archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove MYSQLI_TYPE_INTERVAL constant

Browse source
This commit is contained in:
Kamil Tekiela 2024-08-20 14:30:56 +02:00
parent cce27c6725
commit c290996db6
7 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UPGRADING
View file

@ -882,6 +882,10 @@ PHP 8.4 UPGRADE NOTES
. The MYSQLI_CURSOR_TYPE_FOR_UPDATE and MYSQLI_CURSOR_TYPE_SCROLLABLE . The MYSQLI_CURSOR_TYPE_FOR_UPDATE and MYSQLI_CURSOR_TYPE_SCROLLABLE
constants have been removed. This functionality was never implemented, constants have been removed. This functionality was never implemented,
neither with mysqlnd nor with libmysql. 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. . A new constant has been added: MYSQLI_TYPE_VECTOR.
- Mysqlnd - Mysqlnd

5
ext/mysqli/mysqli.stub.php
View file

@ -390,11 +390,6 @@ const MYSQLI_TYPE_STRING = UNKNOWN;
* @cvalue FIELD_TYPE_CHAR * @cvalue FIELD_TYPE_CHAR
*/ */
const MYSQLI_TYPE_CHAR = UNKNOWN; const MYSQLI_TYPE_CHAR = UNKNOWN;
/**
* @var int
* @cvalue FIELD_TYPE_INTERVAL
*/
const MYSQLI_TYPE_INTERVAL = UNKNOWN;
/** /**
* @var int * @var int
* @cvalue FIELD_TYPE_GEOMETRY * @cvalue FIELD_TYPE_GEOMETRY

3
ext/mysqli/mysqli_arginfo.h generated
View file

@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead. /* 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_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) 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_VAR_STRING", FIELD_TYPE_VAR_STRING, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_STRING", FIELD_TYPE_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_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_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_VECTOR", FIELD_TYPE_VECTOR, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_TYPE_VECTOR", FIELD_TYPE_VECTOR, CONST_PERSISTENT);
#if defined(FIELD_TYPE_JSON) #if defined(FIELD_TYPE_JSON)

1
ext/mysqli/tests/bug_mysql_49406.phpt
View file

@ -58,7 +58,6 @@ require_once 'skipifconnectfailure.inc';
MYSQLI_TYPE_STRING => "STRING", MYSQLI_TYPE_STRING => "STRING",
MYSQLI_TYPE_NULL => "NULL", MYSQLI_TYPE_NULL => "NULL",
MYSQLI_TYPE_NEWDATE => "NEWDATE", MYSQLI_TYPE_NEWDATE => "NEWDATE",
MYSQLI_TYPE_INTERVAL => "INTERVAL",
MYSQLI_TYPE_GEOMETRY => "GEOMETRY", MYSQLI_TYPE_GEOMETRY => "GEOMETRY",
); );

1
ext/mysqli/tests/mysqli_constants.phpt
View file

@ -75,7 +75,6 @@ $expected_constants = array(
"MYSQLI_TYPE_VAR_STRING" => true, "MYSQLI_TYPE_VAR_STRING" => true,
"MYSQLI_TYPE_STRING" => true, "MYSQLI_TYPE_STRING" => true,
"MYSQLI_TYPE_CHAR" => true, "MYSQLI_TYPE_CHAR" => true,
"MYSQLI_TYPE_INTERVAL" => true,
"MYSQLI_TYPE_GEOMETRY" => true, "MYSQLI_TYPE_GEOMETRY" => true,
"MYSQLI_NO_DATA" => true, "MYSQLI_NO_DATA" => true,
"MYSQLI_REPORT_INDEX" => true, "MYSQLI_REPORT_INDEX" => true,

1
ext/mysqli/tests/mysqli_fetch_field_types.phpt
View file

@ -92,7 +92,6 @@ require_once 'skipifconnectfailure.inc';
MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'smash'), MYSQLI_TYPE_STRING => array("SET('I', 'smash', 'the')", 'smash'),
MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL - TODO add testing', MYSQLI_TYPE_NULL => 'MYSQLI_TYPE_NULL - TODO add testing',
MYSQLI_TYPE_NEWDATE => 'MYSQLI_TYPE_NEWDATE - 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', MYSQLI_TYPE_GEOMETRY => 'MYSQLI_TYPE_GEOMETRY - TODO add testing',
); );

1
ext/mysqlnd/mysqlnd_enum_n_def.h
View file

@ -332,7 +332,6 @@ typedef enum mysqlnd_server_option
#define FIELD_TYPE_VAR_STRING MYSQL_TYPE_VAR_STRING #define FIELD_TYPE_VAR_STRING MYSQL_TYPE_VAR_STRING
#define FIELD_TYPE_STRING MYSQL_TYPE_STRING #define FIELD_TYPE_STRING MYSQL_TYPE_STRING
#define FIELD_TYPE_CHAR MYSQL_TYPE_TINY #define FIELD_TYPE_CHAR MYSQL_TYPE_TINY
#define FIELD_TYPE_INTERVAL MYSQL_TYPE_ENUM
#define FIELD_TYPE_GEOMETRY MYSQL_TYPE_GEOMETRY #define FIELD_TYPE_GEOMETRY MYSQL_TYPE_GEOMETRY
#define FIELD_TYPE_BIT MYSQL_TYPE_BIT #define FIELD_TYPE_BIT MYSQL_TYPE_BIT