svn: /php/php-src/branches/PHP_5_3/ NEWS ext/pdo_dblib/dblib_stmt.c

felipe Sun, 06 Mar 2011 13:36:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=308972 Log: - Reverted fix for bug #54167 (to be committed in soon) Bug: http://bugs.php.net/54167 (Feedback) PDO_DBLIB returns null on SQLUNIQUE field Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_stmt.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-03-06 13:34:49 UTC (rev 308971) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-06 13:36:44 UTC (rev 308972) @@ -1,9 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2011, PHP 5.3.6 -- PDO DBLib driver: - . Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field). - (mjh at hodginsmedia dot com, Felipe) 03 Mar 2011, PHP 5.3.6RC2 - Zend Engine: Modified: php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_stmt.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_stmt.c 2011-03-06 13:34:49 UTC (rev 308971) +++ php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_stmt.c 2011-03-06 13:36:44 UTC (rev 308972) @@ -25,7 +25,6 @@ #include "php.h" #include "php_ini.h" -#include "ext/standard/php_string.h" #include "ext/standard/info.h" #include "pdo/php_pdo.h" #include "pdo/php_pdo_driver.h" @@ -174,23 +173,6 @@ val->len = spprintf(&val->data, 0, "%.4f", money_value); } break; -#ifdef SQLUNIQUE - case SQLUNIQUE: { -#else - case 36: { /* FreeTDS hack, also used by ext/mssql */ -#endif - val->len = 36+1; - val->data = emalloc(val->len + 1); - - /* uniqueidentifier is a 16-byte binary number, convert to 32 char hex string */ -#ifdef SQLUNIQUE - val->len = dbconvert(NULL, SQLUNIQUE, dbdata(H->link, i+1), dbdatlen(H->link, i+1), SQLCHAR, val->data, val->len); -#else - val->len = dbconvert(NULL, 36, dbdata(H->link, i+1), dbdatlen(H->link, i+1), SQLCHAR, val->data, val->len); -#endif - php_strtoupper(val->data, val->len); - break; - } default: if (dbwillconvert(S->cols[i].coltype, SQLCHAR)) { val->len = 32 + (2 * dbdatlen(H->link, i+1));