diff options
| author | Christopher Jones <sixd@php.net> | 2011-11-10 22:47:00 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2011-11-10 22:47:00 +0000 |
| commit | 0c00f3a15c90efc43f26decd3ab12ba876cae00f (patch) | |
| tree | f778d7d27114b9b28269d3638204b7217964341c | |
| parent | 14378908723ca045b9c04ebefdb0a1ade9687e69 (diff) | |
| download | php-git-0c00f3a15c90efc43f26decd3ab12ba876cae00f.tar.gz | |
OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS.
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | ext/oci8/oci8.c | 2 | ||||
| -rw-r--r-- | ext/oci8/package.xml | 3 | ||||
| -rw-r--r-- | ext/oci8/tests/array_bind_003.phpt | 4 | ||||
| -rw-r--r-- | ext/oci8/tests/array_bind_004.phpt | 4 | ||||
| -rw-r--r-- | ext/oci8/tests/pecl_bug16842.phpt | 3 |
6 files changed, 16 insertions, 6 deletions
@@ -13,6 +13,9 @@ PHP NEWS . 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 @@ PHP NEWS (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) diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index b943c28454..809ff816ae 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -1632,9 +1632,9 @@ sb4 php_oci_error(OCIError *err_p, sword status TSRMLS_DC) 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"); diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index f086869dea..bcad81b197 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -46,7 +46,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> </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> diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt index 94bce02e31..0875c694f5 100644 --- a/ext/oci8/tests/array_bind_003.phpt +++ b/ext/oci8/tests/array_bind_003.phpt @@ -62,7 +62,9 @@ var_dump($array); 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" diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt index 1eb1fc7fac..df74025d70 100644 --- a/ext/oci8/tests/array_bind_004.phpt +++ b/ext/oci8/tests/array_bind_004.phpt @@ -62,7 +62,9 @@ var_dump($array); 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 diff --git a/ext/oci8/tests/pecl_bug16842.phpt b/ext/oci8/tests/pecl_bug16842.phpt index dbf7e6bb83..ca24d0d276 100644 --- a/ext/oci8/tests/pecl_bug16842.phpt +++ b/ext/oci8/tests/pecl_bug16842.phpt @@ -39,7 +39,8 @@ oci_close($c); 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"]=> |