OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS.

diff --git a/NEWS b/NEWS
index 917560529737641d08c1e7450a2e4f5c24d14314..6e1aada405d80475631cf93032a8ad9d0fb04ede 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 b943c28454cc2985f0320880af5fc0b3827e6566..809ff816ae522280ce7828fe3ff2b911925cb88c 100644 (file)
--- 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 f086869deaaf6a825d38ad33ad36028e36941a7b..bcad81b19717fa18b740ba5c729fb1e16a3de9d5 100644 (file)
--- 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 94bce02e31deefdf1beb61c71cfe3b3b70dda3d7..0875c694f5bdc5021bf28c16feabf0b341a83576 100644 (file)
--- 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 1eb1fc7faca76d54a60ef753e7f0b31ddca20b01..df74025d705d7f02b47bdcf70a5f1f3b4e997a21 100644 (file)
--- 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 dbf7e6bb83c4ebf61f07d3a728b584981968827f..ca24d0d27672f88d05e6aa73adae406da539807c 100644 (file)
--- 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"]=>