Tests: PDO Mysql - update for fixed getColumnMeta()

The test has always been disabled... so it's never run anyway. Oh well.

diff --git a/NEWS b/NEWS
index 70188f5a56c7cd3acf909c2394ca82f69791018f..6fd2bf228437ca0d5ec3ead4f6fef21c7b0f2382 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,10 @@ PHP                                                                        NEWS
   . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
     statement crashes). (Stanley Sufficool)
 
+- PDO_mysql:
+  . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, 
+    TINYINT and YEAR). (Antony, Daniel Beardsley)
+
 - PDO_pgsql:
   . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
 

diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 0fef33487846cea75595bf0dfa4908874e7d4701..d2097f1162cf9a58c124aaf906f2c54a0f75a895 100644 (file)
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -148,9 +148,9 @@ try {
 
        $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
        $is_mysqlnd = MySQLPDOTest::isPDOMySQLnd();
-       test_meta($db, 20, 'BIT(8)', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
-       test_meta($db, 30, 'TINYINT', -127, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
-       test_meta($db, 40, 'TINYINT UNSIGNED', 255, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+       test_meta($db, 20, 'BIT(8)', 1, 'BIT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+       test_meta($db, 30, 'TINYINT', -127, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+       test_meta($db, 40, 'TINYINT UNSIGNED', 255, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
        test_meta($db, 50, 'BOOLEAN', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
 
        test_meta($db, 60, 'SMALLINT', -32768, 'SHORT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
@@ -194,7 +194,7 @@ try {
        test_meta($db, 340, 'TIME', '14:37:00', 'TIME', PDO::PARAM_STR);
        test_meta($db, 350, 'TIMESTAMP', time(), 'TIMESTAMP', PDO::PARAM_STR);
        test_meta($db, 360, 'DATETIME', '2008-03-23 14:38:00', 'DATETIME', PDO::PARAM_STR);
-       test_meta($db, 370, 'YEAR', '2008', NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+       test_meta($db, 370, 'YEAR', '2008', 'YEAR', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
 
        test_meta($db, 380, 'CHAR(1)', 'a', 'STRING', PDO::PARAM_STR);
        test_meta($db, 390, 'CHAR(10)', '0123456789', 'STRING', PDO::PARAM_STR);
@@ -311,4 +311,4 @@ print "done!";
 ?>
 --EXPECTF--
 Testing native PS...
-done!
\ No newline at end of file
+done!