sixd Thu, 10 Nov 2011 22:47:00 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=319015
Log: OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS. Bug: https://bugs.php.net/59985 (Open) No ORA-error message when OCI_NO_DATA Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c U php/php-src/branches/PHP_5_3/ext/oci8/package.xml U php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_004.phpt U php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/ext/oci8/oci8.c U php/php-src/branches/PHP_5_4/ext/oci8/package.xml U php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_003.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_004.phpt U php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug16842.phpt U php/php-src/trunk/ext/oci8/oci8.c U php/php-src/trunk/ext/oci8/package.xml U php/php-src/trunk/ext/oci8/tests/array_bind_003.phpt U php/php-src/trunk/ext/oci8/tests/array_bind_004.phpt U php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/NEWS 2011-11-10 22:47:00 UTC (rev 319015) @@ -13,6 +13,9 @@ . Fixed bug #60160 (imagefill() doesn't work correctly for small images). (Florian) +- Oracle Database extension (OCI8): + . Fixed bug #59985 (show normal warning text for OCI_NO_DATA) + (Chris Jones) 03 Nov 2011, PHP 5.3.9RC1 @@ -77,8 +80,9 @@ (Andrey) - Oracle Database extension (OCI8): - . Increased maxium Oracle error message buffer length for new 11.2.0.3 size. + . Increased maximum Oracle error message buffer length for new 11.2.0.3 size. (Chris Jones) + . Improve internal initalization failure error messages (Chris Jones) - PDO . Fixed bug #55776 (PDORow to session bug). (Johannes) Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c 2011-11-10 22:47:00 UTC (rev 319015) @@ -1632,9 +1632,9 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NEED_DATA"); break; case OCI_NO_DATA: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA"); errcode = php_oci_fetch_errmsg(err_p, &errbuf TSRMLS_CC); if (errbuf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf); efree(errbuf); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA: failed to fetch error message"); Modified: php/php-src/branches/PHP_5_3/ext/oci8/package.xml =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/ext/oci8/package.xml 2011-11-10 22:47:00 UTC (rev 319015) @@ -46,7 +46,8 @@ </stability> <license uri="http://www.php.net/license">PHP</license> <notes> - Increased maximum possible Oracle DB error message length + Fixed bug #59985 (show normal warning text for OCI_NO_DATA) + Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3 size Improve internal initalization failure error messages </notes> <contents> Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_003.php on line %d array(4) { [0]=> string(9) "06-DEC-05" Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_004.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_004.php on line %d array(0) { } Done Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -39,7 +39,8 @@ Test 1 Raises NO_DATA_FOUND -Warning: oci_execute(): OCI_NO_DATA in %s on line 11 +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at line %d in %specl_bug16842.php on line %d bool(false) array(4) { ["code"]=> Modified: php/php-src/branches/PHP_5_4/NEWS =================================================================== --- php/php-src/branches/PHP_5_4/NEWS 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/NEWS 2011-11-10 22:47:00 UTC (rev 319015) @@ -8,6 +8,10 @@ . Fixed bug #60227 (header() cannot detect the multi-line header with CR(0x0D)). (rui) +- Oracle Database extension (OCI8): + . Fixed bug #59985 (show normal warning text for OCI_NO_DATA) + (Chris Jones) + 11 Nov 2011, PHP 5.4.0 RC1 - General improvements: . Changed silent conversion of array to string to produce a notice. (Patrick) @@ -33,8 +37,9 @@ is_a and is_subclass_of). (alan_k) - Oracle Database extension (OCI8): - . Increased maxium Oracle error message buffer length for new 11.2.0.3 size + . Increased maximum Oracle error message buffer length for new 11.2.0.3 size (Chris Jones) + . Improve internal initalization failure error messages (Chris Jones) - SPL extension . Reverted changes that required constructor overrides to invoke the parent Modified: php/php-src/branches/PHP_5_4/ext/oci8/oci8.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/oci8.c 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/ext/oci8/oci8.c 2011-11-10 22:47:00 UTC (rev 319015) @@ -1632,9 +1632,9 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NEED_DATA"); break; case OCI_NO_DATA: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA"); errcode = php_oci_fetch_errmsg(err_p, &errbuf TSRMLS_CC); if (errbuf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf); efree(errbuf); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA: failed to fetch error message"); Modified: php/php-src/branches/PHP_5_4/ext/oci8/package.xml =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/package.xml 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/ext/oci8/package.xml 2011-11-10 22:47:00 UTC (rev 319015) @@ -46,7 +46,8 @@ </stability> <license uri="http://www.php.net/license">PHP</license> <notes> - Increased maximum possible Oracle DB error message length + Fixed bug #59985 (show normal warning text for OCI_NO_DATA) + Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3 size Improve internal initalization failure error messages </notes> <contents> Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_003.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_003.php on line %d array(4) { [0]=> string(9) "06-DEC-05" Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_004.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_004.php on line %d array(0) { } Done Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug16842.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/branches/PHP_5_4/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -39,7 +39,8 @@ Test 1 Raises NO_DATA_FOUND -Warning: oci_execute(): OCI_NO_DATA in %s on line 11 +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at line %d in %specl_bug16842.php on line %d bool(false) array(4) { ["code"]=> Modified: php/php-src/trunk/ext/oci8/oci8.c =================================================================== --- php/php-src/trunk/ext/oci8/oci8.c 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/trunk/ext/oci8/oci8.c 2011-11-10 22:47:00 UTC (rev 319015) @@ -1632,9 +1632,9 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NEED_DATA"); break; case OCI_NO_DATA: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA"); errcode = php_oci_fetch_errmsg(err_p, &errbuf TSRMLS_CC); if (errbuf) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf); efree(errbuf); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA: failed to fetch error message"); Modified: php/php-src/trunk/ext/oci8/package.xml =================================================================== --- php/php-src/trunk/ext/oci8/package.xml 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/trunk/ext/oci8/package.xml 2011-11-10 22:47:00 UTC (rev 319015) @@ -46,7 +46,8 @@ </stability> <license uri="http://www.php.net/license">PHP</license> <notes> - Increased maximum possible Oracle DB error message length + Fixed bug #59985 (show normal warning text for OCI_NO_DATA) + Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3 size Improve internal initalization failure error messages </notes> <contents> Modified: php/php-src/trunk/ext/oci8/tests/array_bind_003.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/trunk/ext/oci8/tests/array_bind_003.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_003.php on line %d array(4) { [0]=> string(9) "06-DEC-05" Modified: php/php-src/trunk/ext/oci8/tests/array_bind_004.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/trunk/ext/oci8/tests/array_bind_004.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -62,7 +62,9 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d +ORA-06512: at line %d in %sarray_bind_004.php on line %d array(0) { } Done Modified: php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt =================================================================== --- php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:41:49 UTC (rev 319014) +++ php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt 2011-11-10 22:47:00 UTC (rev 319015) @@ -39,7 +39,8 @@ Test 1 Raises NO_DATA_FOUND -Warning: oci_execute(): OCI_NO_DATA in %s on line 11 +Warning: oci_execute(): ORA-01403: %s +ORA-06512: at line %d in %specl_bug16842.php on line %d bool(false) array(4) { ["code"]=>
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php