X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fphp_pq.c;h=6223ef95c74f90a47194102be28773dbe6be1006;hb=610b4a3a7a4a14a5bb0996f0f0871eb79e46b8e5;hp=2ac9b196edcd996c3bd72925de4ffd3414f9c477;hpb=168d1f68510e87b77af42fa1e7087ae3c06d5eac;p=m6w6%2Fext-pq diff --git a/src/php_pq.c b/src/php_pq.c index 2ac9b19..6223ef9 100644 --- a/src/php_pq.c +++ b/src/php_pq.c @@ -14,9 +14,12 @@ # include "config.h" #endif +#define SMART_STR_PREALLOC 256 + #include #include #include +#include #include #include @@ -52,7 +55,6 @@ static int php_pqconn_event(PGEventId id, void *e, void *data); ZEND_DECLARE_MODULE_GLOBALS(pq) */ - /* {{{ PHP_INI */ /* Remove comments and fill if you need to have entries in php.ini @@ -522,53 +524,11 @@ static void php_pq_object_delref(void *o TSRMLS_DC) zend_objects_store_del_ref_by_handle_ex(obj->zv.handle, obj->zv.handlers TSRMLS_CC); } -static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) -{ - php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *); - char *quoted_channel = PQescapeIdentifier(obj->intern->conn, key->arKey, key->nKeyLength - 1); - - if (quoted_channel) { - PGresult *res; - char *cmd; - - spprintf(&cmd, 0, "UNLISTEN %s", quoted_channel); - if ((res = PQexec(obj->intern->conn, cmd))) { - PHP_PQclear(res); - } - - efree(cmd); - PQfreemem(quoted_channel); - } - - return ZEND_HASH_APPLY_REMOVE; -} - -static void php_pqconn_notice_ignore(void *p, const PGresult *res) -{ -} - static void php_pqconn_object_free(void *o TSRMLS_DC) { php_pqconn_object_t *obj = o; if (obj->intern) { - php_pqconn_event_data_t *evdata; - PGresult *res; - - if ((evdata = PQinstanceData(obj->intern->conn, php_pqconn_event))) { - memset(evdata, 0, sizeof(*evdata)); - efree(evdata); - PQsetInstanceData(obj->intern->conn, php_pqconn_event, NULL); - } - PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_ignore, NULL); - - /* clean up async results */ - while ((res = PQgetResult(obj->intern->conn))) { - PHP_PQclear(res); - } - - zend_hash_apply_with_arguments(&obj->intern->listeners TSRMLS_CC, apply_unlisten, 1, obj); - php_resource_factory_handle_dtor(&obj->intern->factory, obj->intern->conn TSRMLS_CC); php_resource_factory_dtor(&obj->intern->factory); php_pq_callback_dtor(&obj->intern->onevent); @@ -1756,19 +1716,22 @@ static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t * static void php_pqconn_notice_recv(void *p, const PGresult *res) { php_pqconn_event_data_t *data = p; - zval **evhs; - TSRMLS_DF(data); - if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("notice"), (void *) &evhs)) { - zval *args, *connection = NULL; + if (data) { + zval **evhs; + TSRMLS_DF(data); + + if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("notice"), (void *) &evhs)) { + zval *args, *connection = NULL; - MAKE_STD_ZVAL(args); - array_init(args); - php_pq_object_to_zval(data->obj, &connection TSRMLS_CC); - add_next_index_zval(args, connection); - add_next_index_string(args, PHP_PQresultErrorMessage(res), 1); - zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC); - zval_ptr_dtor(&args); + MAKE_STD_ZVAL(args); + array_init(args); + php_pq_object_to_zval(data->obj, &connection TSRMLS_CC); + add_next_index_zval(args, connection); + add_next_index_string(args, PHP_PQresultErrorMessage(res), 1); + zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC); + zval_ptr_dtor(&args); + } } } @@ -1780,16 +1743,32 @@ typedef struct php_pqconn_resource_factory_data { static void *php_pqconn_resource_factory_ctor(void *data, void *init_arg TSRMLS_DC) { php_pqconn_resource_factory_data_t *o = init_arg; + PGconn *conn = NULL;; if (o->flags & PHP_PQCONN_ASYNC) { - return PQconnectStart(o->dsn); + conn = PQconnectStart(o->dsn); } else { - return PQconnectdb(o->dsn); + conn = PQconnectdb(o->dsn); } + + if (conn) { + PQregisterEventProc(conn, php_pqconn_event, "ext-pq", NULL); + } + + return conn; } static void php_pqconn_resource_factory_dtor(void *opaque, void *handle TSRMLS_DC) { + php_pqconn_event_data_t *evdata = PQinstanceData(handle, php_pqconn_event); + + /* we don't care for anthing, except free'ing evdata */ + if (evdata) { + PQsetInstanceData(handle, php_pqconn_event, NULL); + memset(evdata, 0, sizeof(*evdata)); + efree(evdata); + } + PQfinish(handle); } @@ -1799,28 +1778,74 @@ static php_resource_factory_ops_t php_pqconn_resource_factory_ops = { php_pqconn_resource_factory_dtor }; -static void php_pqconn_persistent_resource_factory_dtor(void *opaque, void *handle TSRMLS_DC) +static void php_pqconn_wakeup(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC) +{ +} + +static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) { + php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *); + char *quoted_channel = PQescapeIdentifier(obj->intern->conn, key->arKey, key->nKeyLength - 1); + + if (quoted_channel) { + PGresult *res; + char *cmd; + + spprintf(&cmd, 0, "UNLISTEN %s", quoted_channel); + if ((res = PQexec(obj->intern->conn, cmd))) { + PHP_PQclear(res); + } + + efree(cmd); + PQfreemem(quoted_channel); + } + + return ZEND_HASH_APPLY_REMOVE; +} + +static void php_pqconn_notice_ignore(void *p, const PGresult *res) +{ +} + +static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC) +{ + php_pqconn_event_data_t *evdata = PQinstanceData(*handle, php_pqconn_event); PGresult *res; - /* clean up */ - if ((res = PQexec(handle, "ROLLBACK; RESET ALL;"))) { + /* go away */ + PQsetInstanceData(*handle, php_pqconn_event, NULL); + + /* ignore notices */ + PQsetNoticeReceiver(*handle, php_pqconn_notice_ignore, NULL); + + /* clean up async results */ + while ((res = PQgetResult(*handle))) { PHP_PQclear(res); } - /* release to the pool, if the connection is alive */ - if (CONNECTION_OK == PQstatus(handle)) { - php_persistent_handle_release(opaque, handle TSRMLS_CC); - } else { - PQfinish(handle); + /* clean up transaction & session */ + switch (PQtransactionStatus(*handle)) { + case PQTRANS_IDLE: + res = PQexec(*handle, "RESET ALL"); + break; + default: + res = PQexec(*handle, "ROLLBACK; RESET ALL"); + break; } -} -static php_resource_factory_ops_t php_pqconn_persistent_resource_factory_ops = { - (php_resource_factory_handle_ctor_t) php_persistent_handle_acquire, - NULL, - php_pqconn_persistent_resource_factory_dtor -}; + if (res) { + PHP_PQclear(res); + } + + if (evdata) { + /* clean up notify listeners */ + zend_hash_apply_with_arguments(&evdata->obj->intern->listeners TSRMLS_CC, apply_unlisten, 1, evdata->obj); + + /* release instance data */ + memset(evdata, 0, sizeof(*evdata)); + efree(evdata); + } +} ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1) ZEND_ARG_INFO(0, dsn) @@ -1844,19 +1869,18 @@ static PHP_METHOD(pqconn, __construct) { zend_hash_init(&obj->intern->eventhandlers, 0, NULL, ZVAL_PTR_DTOR, 0); if (flags & PHP_PQCONN_PERSISTENT) { - php_persistent_handle_factory_t *phf = php_persistent_handle_concede(NULL, ZEND_STRL("pq\\Connection"), dsn_str, dsn_len TSRMLS_CC); - php_resource_factory_init(&obj->intern->factory, &php_pqconn_persistent_resource_factory_ops, phf, (void (*)(void*)) php_persistent_handle_abandon); - } else{ + php_persistent_handle_factory_t *phf = php_persistent_handle_concede(NULL, ZEND_STRL("pq\\Connection"), dsn_str, dsn_len, php_pqconn_wakeup, php_pqconn_retire TSRMLS_CC); + php_resource_factory_init(&obj->intern->factory, php_persistent_handle_get_resource_factory_ops(), phf, (void (*)(void*)) php_persistent_handle_abandon); + } else { php_resource_factory_init(&obj->intern->factory, &php_pqconn_resource_factory_ops, NULL, NULL); } + if (flags & PHP_PQCONN_ASYNC) { obj->intern->poller = (int (*)(PGconn*)) PQconnectPoll; } obj->intern->conn = php_resource_factory_handle_ctor(&obj->intern->factory, &rfdata TSRMLS_CC); - PQregisterEventProc(obj->intern->conn, php_pqconn_event, "ext-pq", NULL); - /* the connection might be persistent, so reset event_proc instance data */ PQsetInstanceData(obj->intern->conn, php_pqconn_event, evdata); PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, evdata); @@ -2271,7 +2295,7 @@ static int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) Oid *tmp; /* +1 for when less types than params are specified */ - *types = tmp = ecalloc(count + 1, sizeof(Oid)); + *types = tmp = ecalloc(count + 1, sizeof(**types)); zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC); } @@ -2293,7 +2317,26 @@ static int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdto return count; } +/* +static Oid *php_pq_ntypes_to_array(zend_bool fill, int argc, ...) +{ + int i; + Oid *oids = ecalloc(argc + 1, sizeof(*oids)); + va_list argv; + + va_start(argv, argc); + for (i = 0; i < argc; ++i) { + if (!fill || !i) { + oids[i] = va_arg(argv, Oid); + } else { + oids[i] = oids[0]; + } + } + va_end(argv); + return oids; +} +*/ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_ARRAY_INFO(0, params, 0) @@ -2874,13 +2917,14 @@ static zend_function_entry php_pqconn_methods[] = { ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0) + ZEND_ARG_ARRAY_INFO(0, namespaces, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(pqtypes, __construct) { zend_error_handling zeh; - zval *zconn; + zval *zconn, *znsp = NULL; zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|a!", &zconn, php_pqconn_class_entry, &znsp)) { php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); if (conn_obj->intern) { @@ -2892,7 +2936,11 @@ static PHP_METHOD(pqtypes, __construct) { php_pq_object_addref(conn_obj TSRMLS_CC); zend_hash_init(&obj->intern->types, 300, NULL, ZVAL_PTR_DTOR, 0); - zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval); + if (znsp) { + zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval, znsp); + } else { + zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval); + } if (retval) { zval_ptr_dtor(&retval); } @@ -2907,17 +2955,52 @@ static PHP_METHOD(pqtypes, __construct) { "select t.oid, t.* " \ "from pg_type t join pg_namespace n on t.typnamespace=n.oid " \ "where typisdefined " \ - "and typrelid=0 " \ - "and nspname in ('public', 'pg_catalog')" + "and typrelid=0" +#define PHP_PQ_OID_TEXT 25 ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_refresh, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, namespaces, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(pqtypes, refresh) { - if (SUCCESS == zend_parse_parameters_none()) { + HashTable *nsp = NULL; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H/!", &nsp)) { php_pqtypes_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); if (obj->intern) { - PGresult *res = PQexec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY); + PGresult *res; + + if (nsp && zend_hash_num_elements(nsp)) { + int i, count; + Oid *oids; + char **params = NULL; + HashTable zdtor; + smart_str str = {0}; + + smart_str_appends(&str, PHP_PQ_TYPES_QUERY " and nspname in("); + zend_hash_init(&zdtor, 0, NULL, ZVAL_PTR_DTOR, 0); + count = php_pq_params_to_array(nsp, ¶ms, &zdtor TSRMLS_CC); + oids = ecalloc(count + 1, sizeof(*oids)); + for (i = 0; i < count; ++i) { + oids[i] = PHP_PQ_OID_TEXT; + if (i) { + smart_str_appendc(&str, ','); + } + smart_str_appendc(&str, '$'); + smart_str_append_unsigned(&str, i+1); + } + smart_str_appendc(&str, ')'); + smart_str_0(&str); + + res = PQexecParams(obj->intern->conn->intern->conn, str.c, count, oids, (const char *const*) params, NULL, NULL, 0); + + smart_str_free(&str); + efree(oids); + efree(params); + zend_hash_destroy(&zdtor); + } else { + res = PQexec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY " and nspname in ('public', 'pg_catalog')"); + } php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC); @@ -3592,12 +3675,44 @@ static PHP_METHOD(pqstm, desc) { zend_restore_error_handling(&zeh TSRMLS_CC); } +ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc_async, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqstm, descAsync) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->intern) { + + obj->intern->conn->intern->poller = PQconsumeInput; + + if (PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) { + RETVAL_TRUE; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn)); + RETVAL_FALSE; + } + + php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC); + + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement not initialized"); + RETVAL_FALSE; + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + + static zend_function_entry php_pqstm_methods[] = { PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(pqstm, bind, ai_pqstm_bind, ZEND_ACC_PUBLIC) PHP_ME(pqstm, exec, ai_pqstm_exec, ZEND_ACC_PUBLIC) PHP_ME(pqstm, desc, ai_pqstm_desc, ZEND_ACC_PUBLIC) PHP_ME(pqstm, execAsync, ai_pqstm_exec_async, ZEND_ACC_PUBLIC) + PHP_ME(pqstm, descAsync, ai_pqstm_desc_async, ZEND_ACC_PUBLIC) {0} }; @@ -4984,7 +5099,7 @@ static PHP_MINIT_FUNCTION(pq) zend_declare_class_constant_long(php_pqcopy_class_entry, ZEND_STRL("FROM_STDIN"), PHP_PQCOPY_FROM_STDIN TSRMLS_CC); zend_declare_class_constant_long(php_pqcopy_class_entry, ZEND_STRL("TO_STDOUT"), PHP_PQCOPY_TO_STDOUT TSRMLS_CC); - php_persistent_handle_provide(ZEND_STRL("pq\\Connection"), &php_pqconn_resource_factory_ops, NULL, NULL); + php_persistent_handle_provide(ZEND_STRL("pq\\Connection"), &php_pqconn_resource_factory_ops, NULL, NULL TSRMLS_CC); /* REGISTER_INI_ENTRIES(); @@ -5040,6 +5155,7 @@ const zend_function_entry pq_functions[] = { static zend_module_dep pq_module_deps[] = { ZEND_MOD_REQUIRED("raphf") + ZEND_MOD_REQUIRED("spl") ZEND_MOD_END };