com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/gd/li bgd/gdft.c ext/pgsql/pgsql.c
ext/pgsql/php_pgsql.h

Commit: f6c611fd8472e98af489e6d3e6a0595d210d20dd Author: Anatol Belski <ab@php.net> Mon, 17 Feb 2014 09:16:13 +0100 Parents: 558795d02b44434d357faaa8433800210c932016 796bfb0bd000f7d9d23e633a965f6a8a77a5e927 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f6c611fd8472e98af489e6d3e6a0595d210d20dd Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport Conflicts: ext/pgsql/pgsql.c ext/pgsql/php_pgsql.h Changed paths: MM ext/gd/libgd/gdft.c MM ext/pgsql/pgsql.c MM ext/pgsql/php_pgsql.h Diff: diff --cc ext/pgsql/pgsql.c index 27ce263,822dae8..7d667c8 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@@ -5303,12 -5299,13 +5331,13 @@@ PHP_FUNCTION(pg_meta_data { zval *pgsql_link; char *table_name; - uint table_name_len; + php_size_t table_name_len; + zend_bool extended=0; PGconn *pgsql; - int id = -1; + php_int_t id = -1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rS", - &pgsql_link, &table_name, &table_name_len) == FAILURE) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|b", ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rS|b", + &pgsql_link, &table_name, &table_name_len, &extended) == FAILURE) { return; } @@@ -6395,13 -6381,15 +6413,16 @@@ PHP_FUNCTION(pg_insert { zval *pgsql_link, *values; char *table, *sql = NULL; - int table_len; - ulong option = PGSQL_DML_EXEC, return_sql; + php_size_t table_len; - php_uint_t option = PGSQL_DML_EXEC; ++ php_uint_t option = PGSQL_DML_EXEC, return_sql; PGconn *pg_link; + PGresult *pg_result; + ExecStatusType status; + pgsql_result_handle *pgsql_handle; - int id = -1, argc = ZEND_NUM_ARGS(); + php_int_t id = -1; + int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "rsa|l", + if (zend_parse_parameters(argc TSRMLS_CC, "rSa|i", &pgsql_link, &table, &table_len, &values, &option) == FAILURE) { return; } diff --cc ext/pgsql/php_pgsql.h index 3f92f51,b6caf9d..26b72d1 --- a/ext/pgsql/php_pgsql.h +++ b/ext/pgsql/php_pgsql.h @@@ -201,13 -203,14 +203,14 @@@ PHP_FUNCTION(pg_select) #define PGSQL_DML_STRING (1<<11) /* Return query string */ #define PGSQL_DML_ESCAPE (1<<12) /* No convert, but escape only */ + /* exported functions */ - PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta TSRMLS_DC); + PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta, zend_bool extended TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval *values, zval *result, ulong opt TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *values, ulong opt, char **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *values, zval *ids, ulong opt , char **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids, ulong opt, char **sql TSRMLS_DC); -PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids, zval *ret_array, ulong opt, char **sql TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval *values, zval *result, php_uint_t opt TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *values, php_uint_t opt, char **sql TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *values, zval *ids, php_uint_t opt , char **sql TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids, php_uint_t opt, char **sql TSRMLS_DC); +PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids, zval *ret_array, php_uint_t opt, char **sql TSRMLS_DC); PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array TSRMLS_DC); /* internal functions */