mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-23 12:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Reverted fix for bug #54167 (to be committed in soon)

Browse Source
This commit is contained in:
Felipe Pena 2011-03-06 13:36:44 +00:00
parent 2f3f629fd4
commit 3986e515da
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -1,9 +1,6 @@
PHP NEWS PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2011, PHP 5.3.6 ?? ??? 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 03 Mar 2011, PHP 5.3.6RC2
- Zend Engine: - Zend Engine:

18
ext/pdo_dblib/dblib_stmt.c
View File

@ -25,7 +25,6 @@
#include "php.h" #include "php.h"
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/php_string.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#include "pdo/php_pdo.h" #include "pdo/php_pdo.h"
#include "pdo/php_pdo_driver.h" #include "pdo/php_pdo_driver.h"
@ -174,23 +173,6 @@ static int pdo_dblib_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
val->len = spprintf(&val->data, 0, "%.4f", money_value); val->len = spprintf(&val->data, 0, "%.4f", money_value);
} }
break; 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: default:
if (dbwillconvert(S->cols[i].coltype, SQLCHAR)) { if (dbwillconvert(S->cols[i].coltype, SQLCHAR)) {
val->len = 32 + (2 * dbdatlen(H->link, i+1)); val->len = 32 + (2 * dbdatlen(H->link, i+1));