danog/ext-pq
1
0
Fork 0
mirror of https://github.com/danog/ext-pq.git synced 2024-11-30 04:19:49 +01:00
Code Issues Projects Releases Wiki Activity

reverse arguments of pq\Result::fetchCol()

Browse Source
This commit is contained in:
Michael Wallner 2014-09-17 09:17:13 +02:00
parent 7e4e6bb2b9
commit 1c52f7b4a5
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/php_pqres.c
View File

@ -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) {

2
tests/basic002.phpt
View File

@ -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

2
tests/encoding001.phpt
View File

@ -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;

2
tests/unbuffered001.phpt
View File

@ -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: