Incorrectly merged PDO dblib patches break uniqueidentifier column type

 [2011-10-10 22:23 UTC] warezthebeef at gmail dot com

Description:
------------
The following patches have been merged into trunk

https://bugs.php.net/bug.php?id=50755
https://bugs.php.net/bug.php?id=54167

However they're slightly incompatible, #50755 changed the structure of the dbconvert() calls and when the merge was made the patch from #54167 wasn't updated to reflect this.

With the attached patch applied the trunk driver is working great.

5.3.x is fine as the changes from #50755 aren't in that branch yet.

Test script:
---------------
Simply query any uniqueidentifier column value, the wrong value is returned.

Expected result:
----------------
The correct value for uniqueidentifier is returned.

Actual result:
--------------
An unrelated sequence of bytes is encoded and returned instead of the expected uniqueidentifier.

 [2011-10-10 22:26 UTC] warezthebeef at gmail dot com

-Summary: Incorrectly merged patches break uniqueidentifier column type +Summary: Incorrectly merged PDO dblib patches break uniqueidentifier column type

 [2011-10-10 22:26 UTC] warezthebeef at gmail dot com

Just clarifying that this bug report/patch applies to the dblib driver

 [2011-10-12 01:24 UTC] felipe@php.net

-Status: Open +Status: Closed -Assigned To: +Assigned To: felipe