Merge branch 'PHP-7.2' into PHP-7.3

cjbj · cjbj · commit 31eeca8a19bb · 2018-12-09T12:38:53.000+11:00
diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c
@@ -262,7 +262,11 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)
 		zend_hash_apply(statement->columns, php_oci_cleanup_pre_fetch);
     }
 
+#if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))
+	PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch2, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, 0, OCI_DEFAULT));
+#else
 	PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, OCI_DEFAULT));
+#endif
 
 	if (errstatus == OCI_NO_DATA || nrows == 0) {
 		if (statement->last_query == NULL) {
@@ -338,7 +342,11 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)
 			}
 		}
 
+#if ((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))
+		PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch2, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, 0, OCI_DEFAULT));
+#else
 		PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, OCI_DEFAULT));
+#endif
 
 		if (piecewisecols) {
 			for (i = 0; i < statement->ncolumns; i++) {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,11 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)`
`262`	`262`	`zend_hash_apply(statement->columns, php_oci_cleanup_pre_fetch);`
`263`	`263`	`}`
`264`	`264`
	`265`	`+#if ((OCI_MAJOR_VERSION > 10) \|\| ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))`
	`266`	`+ PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch2, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, 0, OCI_DEFAULT));`
	`267`	`+#else`
`265`	`268`	`PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, OCI_DEFAULT));`
	`269`	`+#endif`
`266`	`270`
`267`	`271`	`if (errstatus == OCI_NO_DATA \|\| nrows == 0) {`
`268`	`272`	`if (statement->last_query == NULL) {`
`@@ -338,7 +342,11 @@ int php_oci_statement_fetch(php_oci_statement *statement, ub4 nrows)`
`338`	`342`	`}`
`339`	`343`	`}`
`340`	`344`
	`345`	`+#if ((OCI_MAJOR_VERSION > 10) \|\| ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2)))`
	`346`	`+ PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch2, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, 0, OCI_DEFAULT));`
	`347`	`+#else`
`341`	`348`	`PHP_OCI_CALL_RETURN(errstatus, OCIStmtFetch, (statement->stmt, statement->err, nrows, OCI_FETCH_NEXT, OCI_DEFAULT));`
	`349`	`+#endif`
`342`	`350`
`343`	`351`	`if (piecewisecols) {`
`344`	`352`	`for (i = 0; i < statement->ncolumns; i++) {`