MFH: Fixed bug #24752 (Unhandled "uniqueidentifier" field type)

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6a85dd2214b912d71e10e8342385eae05cbcbf14..969150e87e986eb97832bb2e7d2b9b1865d84f95 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -800,6 +800,15 @@ static void php_mssql_get_column_content_with_type(mssql_link *mssql_ptr,int off
                        Z_DVAL_P(result) = (double) floatcol8(offset);
                        Z_TYPE_P(result) = IS_DOUBLE;
                        break;
+#ifdef SQLUNIQUE
+               case SQLUNIQUE: {
+                       char *data = charcol(offset);
+
+                       /* uniqueidentifier is a 16-byte binary number */
+                       ZVAL_STRINGL(result, data, 16, 1);
+                       }
+                       break;
+#endif
                case SQLVARBINARY:
                case SQLBINARY:
                case SQLIMAGE: {
@@ -1470,6 +1479,11 @@ static char *php_mssql_get_field_name(int type)
                case SQLIMAGE:
                        return "image";
                        break;
+#ifdef SQLUNIQUE
+               case SQLUNIQUE:
+                       return "uniqueidentifier";
+                       break;
+#endif
                default:
                        return "unknown";
                        break;

diff --git a/ext/mssql/php_mssql.h b/ext/mssql/php_mssql.h
index 5168f181bc84ae87f03af1c774f45a41cffb25c3..6f2f3b818860a53d8afce3d57b2ff5112efe2ff6 100644 (file)
--- a/ext/mssql/php_mssql.h
+++ b/ext/mssql/php_mssql.h
@@ -59,6 +59,9 @@
 #define SQLIMAGE SYBIMAGE
 #define SQLBINARY SYBBINARY
 #define SQLVARBINARY SYBVARBINARY
+#ifdef SQLUNIQUE /* FreeTSD 0.61+ */
+#define SQLUNIQUE SYBUNIQUE
+#endif
 #define DBERRHANDLE(a, b) dberrhandle(b)
 #define DBMSGHANDLE(a, b) dbmsghandle(b)
 #define DBSETOPT(a, b, c) dbsetopt(a, b, c, -1)