cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h

From: Date: Wed, 23 Jul 2003 16:53:38 +0000
Subject: cvs: php-src(PHP_4_3) /ext/mssql php_mssql.c php_mssql.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-22746@lists.php.net to get a copy of this message
iliaa Wed Jul 23 12:53:38 2003 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mssql php_mssql.c php_mssql.h Log: MFH: Fixed bug #24752 (Unhandled "uniqueidentifier" field type) Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.86.2.21 php-src/ext/mssql/php_mssql.c:1.86.2.22 --- php-src/ext/mssql/php_mssql.c:1.86.2.21 Thu Jul 3 12:47:10 2003 +++ php-src/ext/mssql/php_mssql.c Wed Jul 23 12:53:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.86.2.21 2003/07/03 16:47:10 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.86.2.22 2003/07/23 16:53:37 iliaa Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -800,6 +800,15 @@ 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 @@ case SQLIMAGE: return "image"; break; +#ifdef SQLUNIQUE + case SQLUNIQUE: + return "uniqueidentifier"; + break; +#endif default: return "unknown"; break; Index: php-src/ext/mssql/php_mssql.h diff -u php-src/ext/mssql/php_mssql.h:1.23.4.8 php-src/ext/mssql/php_mssql.h:1.23.4.9 --- php-src/ext/mssql/php_mssql.h:1.23.4.8 Fri Jun 13 23:36:46 2003 +++ php-src/ext/mssql/php_mssql.h Wed Jul 23 12:53:38 2003 @@ -17,7 +17,7 @@ */ -/* $Id: php_mssql.h,v 1.23.4.8 2003/06/14 03:36:46 fmk Exp $ */ +/* $Id: php_mssql.h,v 1.23.4.9 2003/07/23 16:53:38 iliaa Exp $ */ #ifndef PHP_MSSQL_H #define 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)

« previous php.cvs (#22746) next »