com php-src: after merge fix: ext/pgsql/pgsql.c

Commit: 463b4505959879cb67556156b427e2da319bf21f Author: Anatol Belski <ab@php.net> Mon, 17 Feb 2014 09:21:27 +0100 Parents: f6c611fd8472e98af489e6d3e6a0595d210d20dd Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=463b4505959879cb67556156b427e2da319bf21f Log: after merge fix Changed paths: M ext/pgsql/pgsql.c Diff: diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 7d667c8..f37e78b 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -5280,11 +5280,11 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z MAKE_STD_ZVAL(elem); array_init(elem); /* pg_attribute.attnum */ - add_assoc_long(elem, "num", atoi(PQgetvalue(pg_result,i,1))); + add_assoc_int(elem, "num", atoi(PQgetvalue(pg_result,i,1))); /* pg_type.typname */ add_assoc_string(elem, "type", PQgetvalue(pg_result,i,2), 1); /* pg_attribute.attlen */ - add_assoc_long(elem, "len", atoi(PQgetvalue(pg_result,i,3))); + add_assoc_int(elem, "len", atoi(PQgetvalue(pg_result,i,3))); /* pg_attribute.attnonull */ !strcmp(PQgetvalue(pg_result,i,4), "t") ? add_assoc_bool(elem, "not null", 1) : @@ -5294,7 +5294,7 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z add_assoc_bool(elem, "has default", 1) : add_assoc_bool(elem, "has default", 0); /* pg_attribute.attndims */ - add_assoc_long(elem, "array dims", atoi(PQgetvalue(pg_result,i,6))); + add_assoc_int(elem, "array dims", atoi(PQgetvalue(pg_result,i,6))); /* pg_type.typtype */ !strcmp(PQgetvalue(pg_result,i,7), "e") ? add_assoc_bool(elem, "is enum", 1) :