diff options
| author | Felipe Pena <felipe@php.net> | 2011-03-17 11:59:54 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-03-17 11:59:54 +0000 |
| commit | 1e86e8e12c8ad6456b72f60ae657d89d42c9d61b (patch) | |
| tree | 7d8d00e51276780d23a1efff4f27d3320b15ce26 | |
| parent | 07aa25b44276b98c6c5e6a69e9b8b18efab2af9e (diff) | |
| download | php-git-1e86e8e12c8ad6456b72f60ae657d89d42c9d61b.tar.gz | |
- Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field)
patch by: mjh at hodginsmedia dot com
| -rw-r--r-- | ext/pdo_dblib/dblib_stmt.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index 57d9a53ec5..2209663078 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -25,6 +25,7 @@ #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" @@ -173,6 +174,23 @@ static int pdo_dblib_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC) 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)); |