cvs: php4 /ext/odbc php_odbc.c

kalowsky Tue Feb 26 10:33:57 2002 EDT Modified files: /php4/ext/odbc php_odbc.c Log: Bug fix 15719 as submited by Joseph Southwell and allows NULL values in ODBC # I haven't been able to fully test this due to MacOSX compliation errors. # if someone in the QA group could that'd be appriciated. Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.116 php4/ext/odbc/php_odbc.c:1.117 --- php4/ext/odbc/php_odbc.c:1.116 Fri Feb 15 12:24:44 2002 +++ php4/ext/odbc/php_odbc.c Tue Feb 26 10:33:54 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.116 2002/02/15 17:24:44 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.117 2002/02/26 15:33:54 kalowsky Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -875,6 +875,7 @@ } params_t; params_t *params = NULL; char *filename; + unsigned char otype; SWORD sqltype, ctype, scale; SWORD nullable; UDWORD precision; @@ -925,6 +926,8 @@ efree(params); RETURN_FALSE; } + + otype = (*tmp)->type; convert_to_string(*tmp); if (Z_TYPE_PP(tmp) != IS_STRING) { php_error(E_WARNING,"Error converting parameter"); @@ -984,6 +987,10 @@ #ifdef HAVE_DBMAKER precision = params[i-1].vallen; #endif + if (otype == IS_NULL) { + params[i-1].vallen = SQL_NULL_DATA; + } + rc = SQLBindParameter(result->stmt, (UWORD)i, SQL_PARAM_INPUT, ctype, sqltype, precision, scale, Z_STRVAL_PP(tmp), 0,