diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 03927e6eedb..74e302c7663 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -290,7 +290,7 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_name, 0, 0, 2)
ZEND_ARG_INFO(0, statement_resource)
- ZEND_ARG_INFO(0, column_number)
+ ZEND_ARG_INFO(0, column_number_or_name)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_size, 0, 0, 2)
@@ -300,22 +300,22 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_scale, 0, 0, 2)
ZEND_ARG_INFO(0, statement_resource)
- ZEND_ARG_INFO(0, column_number)
+ ZEND_ARG_INFO(0, column_number_or_name)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_precision, 0, 0, 2)
ZEND_ARG_INFO(0, statement_resource)
- ZEND_ARG_INFO(0, column_number)
+ ZEND_ARG_INFO(0, column_number_or_name)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type, 0, 0, 2)
ZEND_ARG_INFO(0, statement_resource)
- ZEND_ARG_INFO(0, column_number)
+ ZEND_ARG_INFO(0, column_number_or_name)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_type_raw, 0, 0, 2)
ZEND_ARG_INFO(0, statement_resource)
- ZEND_ARG_INFO(0, column_number)
+ ZEND_ARG_INFO(0, column_number_or_name)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_field_is_null, 0, 0, 2)
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index d6a62325f32..ca69febb2a6 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1139,7 +1139,7 @@ PHP_FUNCTION(oci_commit)
}
/* }}} */
-/* {{{ proto string oci_field_name(resource stmt, int col)
+/* {{{ proto string oci_field_name(resource stmt, mixed col)
Tell the name of a column */
PHP_FUNCTION(oci_field_name)
{
@@ -1152,7 +1152,7 @@ PHP_FUNCTION(oci_field_name)
}
/* }}} */
-/* {{{ proto int oci_field_size(resource stmt, int col)
+/* {{{ proto int oci_field_size(resource stmt, mixed col)
Tell the maximum data size of a column */
PHP_FUNCTION(oci_field_size)
{
@@ -1169,7 +1169,7 @@ PHP_FUNCTION(oci_field_size)
}
/* }}} */
-/* {{{ proto int oci_field_scale(resource stmt, int col)
+/* {{{ proto int oci_field_scale(resource stmt, mixed col)
Tell the scale of a column */
PHP_FUNCTION(oci_field_scale)
{
@@ -1182,7 +1182,7 @@ PHP_FUNCTION(oci_field_scale)
}
/* }}} */
-/* {{{ proto int oci_field_precision(resource stmt, int col)
+/* {{{ proto int oci_field_precision(resource stmt, mixed col)
Tell the precision of a column */
PHP_FUNCTION(oci_field_precision)
{
@@ -1195,7 +1195,7 @@ PHP_FUNCTION(oci_field_precision)
}
/* }}} */
-/* {{{ proto mixed oci_field_type(resource stmt, int col)
+/* {{{ proto mixed oci_field_type(resource stmt, mixed col)
Tell the data type of a column */
PHP_FUNCTION(oci_field_type)
{
@@ -1275,7 +1275,7 @@ PHP_FUNCTION(oci_field_type)
}
/* }}} */
-/* {{{ proto int oci_field_type_raw(resource stmt, int col)
+/* {{{ proto int oci_field_type_raw(resource stmt, mixed col)
Tell the raw oracle data type of a column */
PHP_FUNCTION(oci_field_type_raw)
{
@@ -1289,8 +1289,8 @@ PHP_FUNCTION(oci_field_type_raw)
}
/* }}} */
-/* {{{ proto bool oci_field_is_null(resource stmt, int col)
- Tell whether a column is NULL */
+/* {{{ proto bool oci_field_is_null(resource stmt, mixed col)
+ Tell whether a field in the current row is NULL */
PHP_FUNCTION(oci_field_is_null)
{
php_oci_out_column *column;
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index c4530bdef02..e5839f13999 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -45,12 +45,12 @@ libraries are available.
no
- 2014-03-11
+ 2014-03-19
- 2.0.8
- 2.0.8
+ 2.0.9
+ 2.0.9
stable
@@ -58,7 +58,7 @@ libraries are available.
PHP
-Enhancement - Improve performance of multi-row OCI_RETURN_LOB queries (Bug #66875)
+Fixed oci_field_* reflection: $field can be a column name or index
@@ -461,6 +461,21 @@ Enhancement - Improve performance of multi-row OCI_RETURN_LOB queries (Bug #6687
+
+
+ 2.0.8
+ 2.0.8
+
+
+ stable
+ stable
+
+ PHP
+
+Enhancement - Improve performance of multi-row OCI_RETURN_LOB queries (Bug #66875)
+
+
+
2.0.7
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
index 5c78faaa646..066812edadb 100644
--- a/ext/oci8/php_oci8.h
+++ b/ext/oci8/php_oci8.h
@@ -45,7 +45,7 @@
*/
#undef PHP_OCI8_VERSION
#endif
-#define PHP_OCI8_VERSION "2.0.8"
+#define PHP_OCI8_VERSION "2.0.9"
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr &oci8_module_entry
diff --git a/ext/oci8/tests/reflection1.phpt b/ext/oci8/tests/reflection1.phpt
index f76d7261aa7..2cf3e4055bb 100644
--- a/ext/oci8/tests/reflection1.phpt
+++ b/ext/oci8/tests/reflection1.phpt
@@ -177,7 +177,7 @@ Function [ function oci_field_name ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -193,7 +193,7 @@ Function [ function oci_field_scale ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -201,7 +201,7 @@ Function [ function oci_field_precision ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -209,7 +209,7 @@ Function [ function oci_field_type ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -217,7 +217,7 @@ Function [ function oci_field_type_raw ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -722,7 +722,7 @@ Function [ function ocicolumnname ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -738,7 +738,7 @@ Function [ function ocicolumnscale ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -746,7 +746,7 @@ Function [ function ocicolumnprecision ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -754,7 +754,7 @@ Function [ function ocicolumntype ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}
@@ -762,7 +762,7 @@ Function [ function ocicolumntyperaw ] {
- Parameters [2] {
Parameter #0 [ $statement_resource ]
- Parameter #1 [ $column_number ]
+ Parameter #1 [ $column_number_or_name ]
}
}