mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL)
add also SET, ENUM, NEWDATE and GEOMETRY to the switch
This commit is contained in:
parent
9ee0707cfa
commit
ab34dafb69
2 changed files with 18 additions and 0 deletions
1
NEWS
1
NEWS
|
@ -24,6 +24,7 @@ PHP NEWS
|
|||
- Fixed bug #35543 (php crash when calling non existing method of a class
|
||||
that extends PDO). (Tony)
|
||||
- Fixed bug #35539 (typo in error message for ErrorException). (Tony)
|
||||
- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
|
||||
- Fixed bug #35509 (string constant as array key has different behavior inside
|
||||
object). (Dmitry)
|
||||
- Fixed bug #35508 (PDO fails when unknown fetch mode specified). (Tony)
|
||||
|
|
|
@ -2188,6 +2188,9 @@ static char *php_mysql_get_field_name(int field_type)
|
|||
case FIELD_TYPE_FLOAT:
|
||||
case FIELD_TYPE_DOUBLE:
|
||||
case FIELD_TYPE_DECIMAL:
|
||||
#ifdef FIELD_TYPE_NEWDECIMAL
|
||||
case FIELD_TYPE_NEWDECIMAL:
|
||||
#endif
|
||||
return "real";
|
||||
break;
|
||||
case FIELD_TYPE_TIMESTAMP:
|
||||
|
@ -2199,11 +2202,25 @@ static char *php_mysql_get_field_name(int field_type)
|
|||
break;
|
||||
#endif
|
||||
case FIELD_TYPE_DATE:
|
||||
#ifdef FIELD_TYPE_NEWDATE
|
||||
case FIELD_TYPE_NEWDATE:
|
||||
#endif
|
||||
return "date";
|
||||
break;
|
||||
case FIELD_TYPE_TIME:
|
||||
return "time";
|
||||
break;
|
||||
case FIELD_TYPE_SET:
|
||||
return "set";
|
||||
break;
|
||||
case FIELD_TYPE_ENUM:
|
||||
return "enum";
|
||||
break;
|
||||
#ifdef FIELD_TYPE_GEOMETRY
|
||||
case FIELD_TYPE_GEOMETRY:
|
||||
return "geometry";
|
||||
break;
|
||||
#endif
|
||||
case FIELD_TYPE_DATETIME:
|
||||
return "datetime";
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue