From: Felipe Pena <felipe@php.net>
Date: Sun, 6 Mar 2011 13:36:44 +0000 (+0000)
Subject: - Reverted fix for bug #54167 (to be committed in soon)
X-Git-Tag: php-5.3.6RC3~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3986e515da1a620dd32c7ced726ab473bb09dfc9;p=php

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

diff --git a/NEWS b/NEWS
index 54e097817c..161d8c830c 100644
--- a/NEWS
+++ b/NEWS
@@ -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:
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index e7c8d9e9db..57d9a53ec5 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -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 @@ 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));