Skip to content

Commit a6cbc6a

Browse files
author
sixd
committed
OCI8: Fixed bug #59985 (show normal warning text for OCI_NO_DATA). Sync NEWS.
git-svn-id: http://svn.php.net/repository/php/php-src/trunk@319015 c90b9560-bf6c-de11-be94-00142212c4b1
1 parent 5da2f1c commit a6cbc6a

File tree

5 files changed

+11
-5
lines changed

5 files changed

+11
-5
lines changed

ext/oci8/oci8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,9 +1632,9 @@ sb4 php_oci_error(OCIError *err_p, sword status TSRMLS_DC)
16321632
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NEED_DATA");
16331633
break;
16341634
case OCI_NO_DATA:
1635-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA");
16361635
errcode = php_oci_fetch_errmsg(err_p, &errbuf TSRMLS_CC);
16371636
if (errbuf) {
1637+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", errbuf);
16381638
efree(errbuf);
16391639
} else {
16401640
php_error_docref(NULL TSRMLS_CC, E_WARNING, "OCI_NO_DATA: failed to fetch error message");

ext/oci8/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
4646
</stability>
4747
<license uri="http://www.php.net/license">PHP</license>
4848
<notes>
49-
Increased maximum possible Oracle DB error message length
49+
Fixed bug #59985 (show normal warning text for OCI_NO_DATA)
50+
Increased maximum Oracle error message buffer length for new Oracle 11.2.0.3 size
5051
Improve internal initalization failure error messages
5152
</notes>
5253
<contents>

ext/oci8/tests/array_bind_003.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ var_dump($array);
6262
echo "Done\n";
6363
?>
6464
--EXPECTF--
65-
Warning: oci_execute(): OCI_NO_DATA in %s on line %d
65+
Warning: oci_execute(): ORA-01403: %s
66+
ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
67+
ORA-06512: at line %d in %sarray_bind_003.php on line %d
6668
array(4) {
6769
[0]=>
6870
string(9) "06-DEC-05"

ext/oci8/tests/array_bind_004.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ var_dump($array);
6262
echo "Done\n";
6363
?>
6464
--EXPECTF--
65-
Warning: oci_execute(): OCI_NO_DATA in %s on line %d
65+
Warning: oci_execute(): ORA-01403: %s
66+
ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
67+
ORA-06512: at line %d in %sarray_bind_004.php on line %d
6668
array(0) {
6769
}
6870
Done

ext/oci8/tests/pecl_bug16842.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ oci_close($c);
3939
Test 1
4040
Raises NO_DATA_FOUND
4141

42-
Warning: oci_execute(): OCI_NO_DATA in %s on line 11
42+
Warning: oci_execute(): ORA-01403: %s
43+
ORA-06512: at line %d in %specl_bug16842.php on line %d
4344
bool(false)
4445
array(4) {
4546
["code"]=>

0 commit comments

Comments
 (0)