diff options
| author | Marcus Boerger <helly@php.net> | 2004-03-15 20:16:59 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2004-03-15 20:16:59 +0000 |
| commit | b83663e0f288ab839a7479d097cb9fe2feeac09c (patch) | |
| tree | 0282b5700185dac99ab08519758026531966e87c | |
| parent | 0ace9f4885d261b14a0492124c9aa4939abd7f5f (diff) | |
| download | php-git-b83663e0f288ab839a7479d097cb9fe2feeac09c.tar.gz | |
Keep BC of pg_fetch_object
| -rw-r--r-- | ext/pgsql/pgsql.c | 17 | ||||
| -rwxr-xr-x | ext/pgsql/tests/22pg_fetch_object.phpt | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 2fb1a3075d..2e77c960d1 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1417,10 +1417,10 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, char *class_name; int class_name_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|sz", &result, &class_name, &class_name_len, &ctor_params) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|zsz", &result, &zrow, &class_name, &class_name_len, &ctor_params) == FAILURE) { return; } - if (ZEND_NUM_ARGS() < 2) { + if (ZEND_NUM_ARGS() < 3) { ce = zend_standard_class_def; } else { ce = zend_fetch_class(class_name, class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC); @@ -1430,16 +1430,15 @@ static void php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, long result_type, return; } result_type = PGSQL_ASSOC; - use_row = 0; } else { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|zl", &result, &zrow, &result_type) == FAILURE) { return; } - use_row = ZEND_NUM_ARGS() > 1 && Z_TYPE_P(zrow) != IS_NULL; - if (use_row) { - convert_to_long_ex(&zrow); - row = Z_LVAL_P(zrow); - } + } + use_row = ZEND_NUM_ARGS() > 1 && Z_TYPE_P(zrow) != IS_NULL; + if (use_row) { + convert_to_long_ex(&zrow); + row = Z_LVAL_P(zrow); } if (!(result_type & PGSQL_BOTH)) { @@ -1600,7 +1599,7 @@ PHP_FUNCTION(pg_fetch_array) } /* }}} */ -/* {{{ proto object pg_fetch_object(resource result [, string class_name [, NULL|array ctor_params]]) +/* {{{ proto object pg_fetch_object(resource result [, int row [, string class_name [, NULL|array ctor_params]]]) Fetch a row as an object */ PHP_FUNCTION(pg_fetch_object) { diff --git a/ext/pgsql/tests/22pg_fetch_object.phpt b/ext/pgsql/tests/22pg_fetch_object.phpt index d0b406d879..4f2f5dc184 100755 --- a/ext/pgsql/tests/22pg_fetch_object.phpt +++ b/ext/pgsql/tests/22pg_fetch_object.phpt @@ -1,5 +1,5 @@ --TEST-- -PostgreSQL pg_fetch_*() functions +PostgreSQL pg_fetch_object() --SKIPIF-- <?php include("skipif.inc"); ?> --FILE-- @@ -20,7 +20,7 @@ $sql = "SELECT * FROM $table_name"; $result = pg_query($db, $sql) or die('Cannot qeury db'); $rows = pg_num_rows($result); -var_dump(pg_fetch_object($result, 'test_class', array(1, 2))); +var_dump(pg_fetch_object($result, NULL, 'test_class', array(1, 2))); echo "Ok\n"; ?> |