From: Michael Wallner <mike@php.net>
Date: Wed, 17 Sep 2014 07:17:13 +0000 (+0200)
Subject: reverse arguments of pq\Result::fetchCol()
X-Git-Tag: v0.5.0~20
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1c52f7b4a52260c93351de3d1c83748f85e77f6c;p=m6w6%2Fext-pq

reverse arguments of pq\Result::fetchCol()
---

diff --git a/src/php_pqres.c b/src/php_pqres.c
index cd3b2b7..eeda258 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -775,17 +775,17 @@ static zval **column_at(zval *row, int col TSRMLS_DC)
 	return data;
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 2)
-	ZEND_ARG_INFO(0, col)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 1)
 	ZEND_ARG_INFO(1, ref)
+	ZEND_ARG_INFO(0, col)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, fetchCol) {
 	zend_error_handling zeh;
-	zval *zcol, *zref;
+	zval *zcol = NULL, *zref;
 	STATUS rv;
 
 	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
-	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z", &zcol, &zref);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|z/!", &zref, &zcol);
 	zend_restore_error_handling(&zeh TSRMLS_CC);
 
 	if (SUCCESS == rv) {
diff --git a/tests/basic002.phpt b/tests/basic002.phpt
index 4a6fbd8..2afb785 100644
--- a/tests/basic002.phpt
+++ b/tests/basic002.phpt
@@ -13,7 +13,7 @@ $s = $c->prepare("test1", "SELECT \$1",array($t["text"]->oid));
 $r = $s->exec(array("fooo"));
 
 printf("%s\n", $r->errorMessage);
-$r->fetchCol(0, $val);
+$r->fetchCol($val);
 printf("%s\n", $val);
 ?>
 DONE
diff --git a/tests/encoding001.phpt b/tests/encoding001.phpt
index b4067bc..53bcef5 100644
--- a/tests/encoding001.phpt
+++ b/tests/encoding001.phpt
@@ -11,7 +11,7 @@ $c = new pq\Connection(PQ_DSN);
 var_dump($c->encoding);
 $c->encoding = "utf8";
 var_dump($c->encoding);
-$c->exec("SELECT 'ßüpä…'")->fetchCol(0, $val);
+$c->exec("SELECT 'ßüpä…'")->fetchCol($val);
 var_dump($val);
 $tmp = 12345;
 $c->encoding = $tmp;
diff --git a/tests/unbuffered001.phpt b/tests/unbuffered001.phpt
index b0df231..4bc4d85 100644
--- a/tests/unbuffered001.phpt
+++ b/tests/unbuffered001.phpt
@@ -16,7 +16,7 @@ var_dump($c->unbuffered);
 $c->execAsync("SELECT a from generate_series(1,10) a", function($res) {
 	switch ($res->status) {
 	case pq\Result::SINGLE_TUPLE:
-		$res->fetchCol("a", $val);
+		$res->fetchCol($val, "a");
 		printf("%s\n", $val);
 		break;
 	case pq\Result::TUPLES_OK: