diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-03-28 09:12:18 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-03-28 09:12:18 +0000 |
| commit | 6dc42ef117e8a3a678b080b761a873353173b945 (patch) | |
| tree | 951b714ce85c1cebfe6da173f1a9c2e6d6668a16 /ext/oci8/oci8_interface.c | |
| parent | cdbe8b4fd876219f5c67376474d3bb6bcc9c401b (diff) | |
| download | php-git-6dc42ef117e8a3a678b080b761a873353173b945.tar.gz | |
fix #36851 (Documentation and code discrepancies for NULL data)
Diffstat (limited to 'ext/oci8/oci8_interface.c')
| -rw-r--r-- | ext/oci8/oci8_interface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index 29e1a710db..51da8c187f 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -1439,7 +1439,7 @@ PHP_FUNCTION(oci_fetch_all) 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)); @@ -1451,7 +1451,7 @@ PHP_FUNCTION(oci_fetch_object) 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); } /* }}} */ @@ -1459,7 +1459,7 @@ PHP_FUNCTION(oci_fetch_row) 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); } /* }}} */ @@ -1467,7 +1467,7 @@ PHP_FUNCTION(oci_fetch_assoc) 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); } /* }}} */ @@ -1521,7 +1521,7 @@ PHP_FUNCTION(oci_new_connect) } /* }}} */ -/* {{{ 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) { @@ -1529,7 +1529,7 @@ PHP_FUNCTION(oci_connect) } /* }}} */ -/* {{{ 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) { |