Skip to content

Use MYSQL_TYPE constants instead of FIELD_TYPE #20249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: PHP-8.3
Choose a base branch
from
+4 −3
Open

Use MYSQL_TYPE constants instead of FIELD_TYPE #20249

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c81682
Use MYSQL_TYPE constants instead of FIELD_TYPE
nielsdos Oct 20, 2025
388ce87
Adjust version
nielsdos Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ext/pdo_mysql/mysql_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ static int pdo_mysql_stmt_get_col(

static char *type_to_name_native(int type) /* {{{ */
{
#define PDO_MYSQL_NATIVE_TYPE_NAME(x) case FIELD_TYPE_##x: return #x;
#define PDO_MYSQL_NATIVE_TYPE_NAME(x) case MYSQL_TYPE_##x: return #x;

switch (type) {
PDO_MYSQL_NATIVE_TYPE_NAME(STRING)
Expand Down Expand Up @@ -749,10 +749,11 @@ static char *type_to_name_native(int type) /* {{{ */
#ifdef FIELD_TYPE_NEWDATE
PDO_MYSQL_NATIVE_TYPE_NAME(NEWDATE)
#endif
#ifdef FIELD_TYPE_VECTOR
/* The following 2 don't have BC FIELD_TYPE_* aliases. */
#if MYSQL_VERSION_ID >= 90000 && !defined(MARIADB_BASE_VERSION) /* TODO: mysqlnd support (added in 8.4 via a1ab846231aeff49c0441a30ebd44463fc7825b1) */
PDO_MYSQL_NATIVE_TYPE_NAME(VECTOR)
#endif
#ifdef FIELD_TYPE_JSON
#if MYSQL_VERSION_ID >= 50708 || defined(PDO_USE_MYSQLND)
PDO_MYSQL_NATIVE_TYPE_NAME(JSON)
#endif
PDO_MYSQL_NATIVE_TYPE_NAME(TIME)
Expand Down
Loading