diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-17 00:41:46 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-17 00:42:21 -0700 |
| commit | a080611e484aa56e3be6ab038221ab3304c125b1 (patch) | |
| tree | febcd7403b5766e250fc1b3c61a2c747a4c52407 /ext/pdo_mysql/tests | |
| parent | 69d187de02f771cae6c1a029ffd9a1b3b09d59d4 (diff) | |
| parent | 5ac0ee30cec04b7527eb81abb84ed37f0c74da7a (diff) | |
| download | php-git-a080611e484aa56e3be6ab038221ab3304c125b1.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
Diffstat (limited to 'ext/pdo_mysql/tests')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt index 0fef334878..d2097f1162 100644 --- 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! |