fmk Wed Feb 9 13:50:50 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/fbsql php_fbsql.c Log: MFH: Check for warnings and return the warning texts http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.86.2.12&r2=1.86.2.13&ty=u Index: php-src/ext/fbsql/php_fbsql.c diff -u php-src/ext/fbsql/php_fbsql.c:1.86.2.12 php-src/ext/fbsql/php_fbsql.c:1.86.2.13 --- php-src/ext/fbsql/php_fbsql.c:1.86.2.12 Thu Jan 27 15:22:27 2005 +++ php-src/ext/fbsql/php_fbsql.c Wed Feb 9 13:50:49 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.86.2.12 2005/01/27 20:22:27 fmk Exp $ */ +/* $Id: php_fbsql.c,v 1.86.2.13 2005/02/09 18:50:49 fmk Exp $ */ /* TODO: * @@ -1807,11 +1807,28 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message"); } link->errorText = strdup(emg); - link->errorNo = fbcemdErrorCodeAtIndex(emd, 0);; + link->errorNo = fbcemdErrorCodeAtIndex(emd, 0); free(emg); fbcemdRelease(emd); result = 0; } + else if (fbcmdWarningsFound(md)) + { + FBCErrorMetaData* emd = fbcdcErrorMetaData(c, md); + char* emg = fbcemdAllErrorMessages(emd); + if (FB_SQL_G(generateWarnings)) + { + if (emg) + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Warning in statement: '%s' %s", sql, emg); + else + php_error_docref(NULL TSRMLS_CC, E_WARNING, "No message"); + } + link->errorText = strdup(emg); + link->errorNo = fbcemdErrorCodeAtIndex(emd, 0); + free(emg); + fbcemdRelease(emd); + result = 1; + } return result; } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php