diff options
| author | Antony Dovgal <tony@daylessday.org> | 2012-04-13 13:59:52 +0400 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-17 00:27:21 -0700 |
| commit | 95cc763a1484c4922f6577c10de937299dc8c8e0 (patch) | |
| tree | 25c36446ea0e6e5340f9cc12264d822285149638 | |
| parent | 248414f132534c6fa99a94ebc69a7cfd88f8c443 (diff) | |
| download | php-git-95cc763a1484c4922f6577c10de937299dc8c8e0.tar.gz | |
fix bug #48724
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 2ae559571d..369c389462 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -761,9 +761,12 @@ static char *type_to_name_native(int type) /* {{{ */ switch (type) { PDO_MYSQL_NATIVE_TYPE_NAME(STRING) PDO_MYSQL_NATIVE_TYPE_NAME(VAR_STRING) -#ifdef MYSQL_HAS_TINY +#ifdef FIELD_TYPE_TINY PDO_MYSQL_NATIVE_TYPE_NAME(TINY) #endif +#ifdef FIELD_TYPE_BIT + PDO_MYSQL_NATIVE_TYPE_NAME(BIT) +#endif PDO_MYSQL_NATIVE_TYPE_NAME(SHORT) PDO_MYSQL_NATIVE_TYPE_NAME(LONG) PDO_MYSQL_NATIVE_TYPE_NAME(LONGLONG) @@ -778,7 +781,7 @@ static char *type_to_name_native(int type) /* {{{ */ PDO_MYSQL_NATIVE_TYPE_NAME(GEOMETRY) #endif PDO_MYSQL_NATIVE_TYPE_NAME(TIMESTAMP) -#ifdef MYSQL_HAS_YEAR +#ifdef FIELD_TYPE_YEAR PDO_MYSQL_NATIVE_TYPE_NAME(YEAR) #endif PDO_MYSQL_NATIVE_TYPE_NAME(SET) |