]> granicus.if.org Git - php/commitdiff
fix bug #48724
authorAntony Dovgal <tony@daylessday.org>
Fri, 13 Apr 2012 09:59:52 +0000 (13:59 +0400)
committerStanislav Malyshev <stas@php.net>
Mon, 17 Jun 2013 07:27:21 +0000 (00:27 -0700)
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR

ext/pdo_mysql/mysql_statement.c

index 2ae559571d48dc93ab4e056f567341981962e558..369c389462789ecb03a7818eadb08a2c44ab3083 100644 (file)
@@ -761,8 +761,11 @@ 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)
@@ -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)