cvs: php-src /ext/oci8 oci8_interface.c
| From: | Antony Dovgal | Date: | Tue, 28 Mar 2006 09:13:22 +0000 |
| Subject: | cvs: php-src /ext/oci8 oci8_interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-37555@lists.php.net to get a copy of this message | ||
tony2001 Tue Mar 28 09:13:22 2006 UTC
Modified files:
/php-src/ext/oci8 oci8_interface.c
Log:
MF51: fix #36851 (Documentation and code discrepancies for NULL data)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.14 php-src/ext/oci8/oci8_interface.c:1.15
--- php-src/ext/oci8/oci8_interface.c:1.14 Tue Mar 21 15:47:38 2006
+++ php-src/ext/oci8/oci8_interface.c Tue Mar 28 09:13:22 2006
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.14 2006/03/21 15:47:38 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.15 2006/03/28 09:13:22 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1435,7 +1435,7 @@
Fetch a result row as an object */
PHP_FUNCTION(oci_fetch_object)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS, 2);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
@@ -1447,7 +1447,7 @@
Fetch a result row as an enumerated array */
PHP_FUNCTION(oci_fetch_row)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM | PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1455,7 +1455,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(oci_fetch_assoc)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC | PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1463,7 +1463,7 @@
Fetch a result row as an array */
PHP_FUNCTION(oci_fetch_array)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH | PHP_OCI_RETURN_NULLS, 2);
}
/* }}} */
@@ -1517,7 +1517,7 @@
}
/* }}} */
-/* {{{ proto resource oci_connect(string user, string pass [, string db])
+/* {{{ proto resource oci_connect(string user, string pass [, string db [, string charset [, int
session_mode ]])
Connect to an Oracle database and log on. Returns a new session. */
PHP_FUNCTION(oci_connect)
{
@@ -1525,7 +1525,7 @@
}
/* }}} */
-/* {{{ proto resource oci_pconnect(string user, string pass [, string db])
+/* {{{ proto resource oci_pconnect(string user, string pass [, string db [, string charset ]])
Connect to an Oracle database using a persistent connection and log on. Returns a new session.
*/
PHP_FUNCTION(oci_pconnect)
{