X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq.c;h=c220f2e713afa7f3bb791eeb84a7b3e914088e16;hp=eb9bac1e5a344182a6d64acb5d18eec25413b383;hb=53220e4b7f293ed8c1c8418efc98c57d4b205e1d;hpb=7f802ff71998282994dbfd9af51c08bb5d6dccdc diff --git a/src/php_pq.c b/src/php_pq.c index eb9bac1..c220f2e 100644 --- a/src/php_pq.c +++ b/src/php_pq.c @@ -20,6 +20,7 @@ #include #include +#include #include "php_pq.h" @@ -82,19 +83,35 @@ static zend_object_handlers php_pqconn_object_handlers; static zend_object_handlers php_pqres_object_handlers; static zend_object_handlers php_pqstm_object_handlers; -typedef struct php_pqconn_listener { +typedef struct php_pq_callback { zend_fcall_info fci; zend_fcall_info_cache fcc; -} php_pqconn_listener_t; + void *data; +} php_pq_callback_t; + +typedef struct php_pq_object { + zend_object zo; + void *intern; + HashTable *prophandler; +} php_pq_object_t; typedef struct php_pqconn_object { zend_object zo; PGconn *conn; + HashTable *prophandler; + int (*poller)(PGconn *); HashTable listeners; - unsigned async:1; + php_pq_callback_t onevent; } php_pqconn_object_t; +typedef struct php_pqconn_event_data { + php_pqconn_object_t *obj; +#ifdef ZTS + void ***ts; +#endif +} php_pqconn_event_data_t; + typedef enum php_pqres_fetch { PHP_PQRES_FETCH_ARRAY, PHP_PQRES_FETCH_ASSOC, @@ -111,15 +128,30 @@ typedef struct php_pqres_iterator { typedef struct php_pqres_object { zend_object zo; PGresult *res; + HashTable *prophandler; + php_pqres_iterator_t *iter; } php_pqres_object_t; typedef struct php_pqstm_object { zend_object zo; char *name; + HashTable *prophandler; + zval *conn; } php_pqstm_object_t; +static HashTable php_pqconn_object_prophandlers; +static HashTable php_pqres_object_prophandlers; +static HashTable php_pqstm_object_prophandlers; + +typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC); + +typedef struct php_pq_object_prophandler { + php_pq_object_prophandler_func_t read; + php_pq_object_prophandler_func_t write; +} php_pq_object_prophandler_t; + static zend_object_iterator_funcs php_pqres_iterator_funcs; static zend_object_iterator *php_pqres_iterator_init(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) @@ -278,6 +310,25 @@ static zend_object_iterator_funcs php_pqres_iterator_funcs = { NULL }; +static void php_pq_callback_dtor(php_pq_callback_t *cb) { + if (cb->fci.size > 0) { + zend_fcall_info_args_clear(&cb->fci, 1); + zval_ptr_dtor(&cb->fci.function_name); + if (cb->fci.object_ptr) { + zval_ptr_dtor(&cb->fci.object_ptr); + } + } + cb->fci.size = 0; +} + +static void php_pq_callback_addref(php_pq_callback_t *cb) +{ + Z_ADDREF_P(cb->fci.function_name); + if (cb->fci.object_ptr) { + Z_ADDREF_P(cb->fci.object_ptr); + } +} + static void php_pqconn_object_free(void *o TSRMLS_DC) { php_pqconn_object_t *obj = o; @@ -286,18 +337,29 @@ static void php_pqconn_object_free(void *o TSRMLS_DC) PQfinish(obj->conn); obj->conn = NULL; } + if (obj->onevent.fci.size > 0) { + php_pq_callback_dtor(&obj->onevent); + } zend_hash_destroy(&obj->listeners); zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(obj); } +static int php_pqconn_event(PGEventId id, void *e, void *data); + static void php_pqres_object_free(void *o TSRMLS_DC) { php_pqres_object_t *obj = o; if (obj->res) { - PQclear(obj->res); - obj->res = NULL; + zval *res = PQresultInstanceData(obj->res, php_pqconn_event); + if (res) { + PQresultSetInstanceData(obj->res, php_pqconn_event, NULL); + zval_ptr_dtor(&res); + } else { + PQclear(obj->res); + obj->res = NULL; + } } if (obj->iter) { php_pqres_iterator_dtor((zend_object_iterator *) obj->iter TSRMLS_CC); @@ -331,6 +393,7 @@ static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGcon o = ecalloc(1, sizeof(*o)); zend_object_std_init((zend_object *) o, ce TSRMLS_CC); object_properties_init((zend_object *) o, ce); + o->prophandler = &php_pqconn_object_prophandlers; if (ptr) { *ptr = o; @@ -338,7 +401,6 @@ static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGcon if (conn) { o->conn = conn; - o->async = !PQisnonblocking(o->conn); } zend_hash_init(&o->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0); @@ -357,6 +419,7 @@ static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresu o = ecalloc(1, sizeof(*o)); zend_object_std_init((zend_object *) o, ce TSRMLS_CC); object_properties_init((zend_object *) o, ce); + o->prophandler = &php_pqres_object_prophandlers; if (ptr) { *ptr = o; @@ -380,6 +443,7 @@ static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval * o = ecalloc(1, sizeof(*o)); zend_object_std_init((zend_object *) o, ce TSRMLS_CC); object_properties_init((zend_object *) o, ce); + o->prophandler = &php_pqstm_object_prophandlers; if (ptr) { *ptr = o; @@ -415,17 +479,56 @@ static zend_object_value php_pqstm_create_object(zend_class_entry *class_type TS return php_pqstm_create_object_ex(class_type, NULL, NULL, NULL TSRMLS_CC); } -static HashTable php_pqconn_object_prophandlers; -static HashTable php_pqres_object_prophandlers; -static HashTable php_pqstm_object_prophandlers; +static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) +{ + php_pq_object_prophandler_t *ph = p; + HashTable *ht = va_arg(argv, HashTable *); + zval **return_value, *object = va_arg(argv, zval *); + php_pq_object_t *obj = va_arg(argv, php_pq_object_t *); -typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC); + if (SUCCESS == zend_hash_find(ht, key->arKey, key->nKeyLength, (void *) &return_value)) { + if (ph->read) { + MAKE_STD_ZVAL(*return_value); + ZVAL_NULL(*return_value); -typedef struct php_pq_object_prophandler { - php_pq_object_prophandler_func_t read; - php_pq_object_prophandler_func_t write; -} php_pq_object_prophandler_t; + ph->read(object, obj, *return_value TSRMLS_CC); + } else { + zval member; + + INIT_PZVAL(&member); + ZVAL_STRINGL(&member, key->arKey, key->nKeyLength-1, 0); + *return_value = zend_get_std_object_handlers()->read_property(object, &member, BP_VAR_R, NULL TSRMLS_CC); + Z_ADDREF_PP(return_value); + } + } + return ZEND_HASH_APPLY_KEEP; +} + +static int apply_pi_to_debug(void *p, void *arg TSRMLS_DC) +{ + zend_property_info *pi = p; + HashTable *ht = arg; + + zend_hash_add_empty_element(ht, pi->name, pi->name_length + 1); + + return ZEND_HASH_APPLY_KEEP; +} + +static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC) +{ + HashTable *ht; + php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); + + *temp = 1; + ALLOC_HASHTABLE(ht); + ZEND_INIT_SYMTABLE(ht); + + zend_hash_apply_with_argument(&obj->zo.ce->properties_info, apply_pi_to_debug, ht TSRMLS_CC); + zend_hash_apply_with_arguments(obj->prophandler TSRMLS_CC, apply_ph_to_debug, 3, ht, object, obj); + + return ht; +} static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC) { php_pqconn_object_t *obj = o; @@ -454,7 +557,7 @@ static void php_pqconn_object_read_error_message(zval *object, void *o, zval *re static int apply_notify_listener(void *p, void *arg TSRMLS_DC) { - php_pqconn_listener_t *listener = p; + php_pq_callback_t *listener = p; PGnotify *nfy = arg; zval *zpid, *zchannel, *zmessage; @@ -475,11 +578,14 @@ static int apply_notify_listener(void *p, void *arg TSRMLS_DC) return ZEND_HASH_APPLY_KEEP; } -static int apply_notify_listeners(void *p, void *arg TSRMLS_DC) +static int apply_notify_listeners(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) { HashTable *listeners = p; + PGnotify *nfy = va_arg(argv, PGnotify *); - zend_hash_apply_with_argument(listeners, apply_notify_listener, arg TSRMLS_CC); + if (0 == fnmatch(key->arKey, nfy->relname, 0)) { + zend_hash_apply_with_argument(listeners, apply_notify_listener, nfy TSRMLS_CC); + } return ZEND_HASH_APPLY_KEEP; } @@ -493,7 +599,7 @@ static void php_pqconn_notify_listeners(zval *this_ptr, php_pqconn_object_t *obj } while ((nfy = PQnotifies(obj->conn))) { - zend_hash_apply_with_argument(&obj->listeners, apply_notify_listeners, nfy TSRMLS_CC); + zend_hash_apply_with_arguments(&obj->listeners TSRMLS_CC, apply_notify_listeners, 1, nfy); PQfreemem(nfy); } } @@ -544,6 +650,38 @@ static void php_pqconn_object_read_types(zval *object, void *o, zval *return_val } } +static void php_pqconn_object_read_busy(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqconn_object_t *obj = o; + + RETVAL_BOOL(PQisBusy(obj->conn)); +} + +static void php_pqconn_object_read_encoding(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqconn_object_t *obj = o; + + RETVAL_STRING(pg_encoding_to_char(PQclientEncoding(obj->conn)), 1); +} + +static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value TSRMLS_DC) +{ + php_pqconn_object_t *obj = o; + zval *zenc = value; + + if (Z_TYPE_P(value) != IS_STRING) { + convert_to_string_ex(&zenc); + } + + if (0 > PQsetClientEncoding(obj->conn, Z_STRVAL_P(zenc))) { + zend_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc)); + } + + if (zenc != value) { + zval_ptr_dtor(&zenc); + } +} + static void php_pqres_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC) { php_pqres_object_t *obj = o; @@ -604,6 +742,10 @@ static void php_pqres_object_write_fetch_type(zval *object, void *o, zval *value convert_to_long_ex(&zfetch_type); } + if (!obj->iter) { + obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC); + obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC); + } obj->iter->fetch_type = Z_LVAL_P(zfetch_type); if (zfetch_type != value) { @@ -625,102 +767,22 @@ static void php_pqstm_object_read_connection(zval *object, void *o, zval *return RETVAL_ZVAL(obj->conn, 1, 0); } -static zval *php_pqconn_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) -{ - php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - zval *return_value; - - if (!obj->conn) { - zend_error(E_WARNING, "Connection not initialized"); - } else if ((SUCCESS == zend_hash_find(&php_pqconn_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) && handler->read) { - if (type == BP_VAR_R) { - ALLOC_ZVAL(return_value); - Z_SET_REFCOUNT_P(return_value, 0); - Z_UNSET_ISREF_P(return_value); - - handler->read(object, obj, return_value TSRMLS_CC); - } else { - zend_error(E_ERROR, "Cannot access pq\\Connection properties by reference or array key/index"); - return_value = NULL; - } - } else { - return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC); - } - - return return_value; -} - -static void php_pqconn_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) -{ - php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - - if (SUCCESS == zend_hash_find(&php_pqconn_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { - if (handler->write) { - handler->write(object, obj, value TSRMLS_CC); - } - } else { - zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC); - } -} - -static zval *php_pqres_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) -{ - php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - zval *return_value; - - if (!obj->res) { - zend_error(E_WARNING, "Result not initialized"); - } else if (SUCCESS == zend_hash_find(&php_pqres_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { - if (type == BP_VAR_R) { - ALLOC_ZVAL(return_value); - Z_SET_REFCOUNT_P(return_value, 0); - Z_UNSET_ISREF_P(return_value); - - handler->read(object, obj, return_value TSRMLS_CC); - } else { - zend_error(E_ERROR, "Cannot access pq\\Result properties by reference or array key/index"); - return_value = NULL; - } - } else { - return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC); - } - - return return_value; -} - -static void php_pqres_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) -{ - php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - - if (!obj->res) { - zend_error(E_WARNING, "Result not initialized"); - } else if (SUCCESS == zend_hash_find(&php_pqres_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { - if (handler->write) { - /* ensure obj->iter is initialized, for e.g. write_fetch_type */ - if (!obj->iter) { - obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC); - obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC); - } - handler->write(object, obj, value TSRMLS_CC); - } - } else { - zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC); +static zend_class_entry *ancestor(zend_class_entry *ce) { + while (ce->parent) { + ce = ce->parent; } + return ce; } -static zval *php_pqstm_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +static zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) { - php_pqstm_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); + php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); php_pq_object_prophandler_t *handler; zval *return_value; - if (!obj->conn) { - zend_error(E_WARNING, "Statement not initialized"); - } else if (SUCCESS == zend_hash_find(&php_pqstm_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { + if (!obj->intern) { + zend_error(E_WARNING, "%s not initialized", ancestor(obj->zo.ce)->name); + } else if ((SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) && handler->read) { if (type == BP_VAR_R) { ALLOC_ZVAL(return_value); Z_SET_REFCOUNT_P(return_value, 0); @@ -728,7 +790,7 @@ static zval *php_pqstm_object_read_prop(zval *object, zval *member, int type, co handler->read(object, obj, return_value TSRMLS_CC); } else { - zend_error(E_ERROR, "Cannot access pq\\Statement properties by reference or array key/index"); + zend_error(E_ERROR, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name); return_value = NULL; } } else { @@ -738,14 +800,12 @@ static zval *php_pqstm_object_read_prop(zval *object, zval *member, int type, co return return_value; } -static void php_pqstm_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +static void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) { - php_pqstm_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); + php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); php_pq_object_prophandler_t *handler; - if (!obj->conn) { - zend_error(E_WARNING, "Result not initialized"); - } else if (SUCCESS == zend_hash_find(&php_pqstm_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { + if (SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) { if (handler->write) { handler->write(object, obj, value TSRMLS_CC); } @@ -784,6 +844,72 @@ static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj return retval; } +#ifdef ZTS +# define TSRMLS_DF(d) TSRMLS_D = (d)->ts +# define TSRMLS_CF(d) (d)->ts = TSRMLS_C +#else +# define TSRMLS_DF(d) +# define TSRMLS_CF(d) +#endif + +static void php_pqconn_event_register(PGEventRegister *event, php_pqconn_event_data_t *data) +{ + PQsetInstanceData(event->conn, php_pqconn_event, data); +} +static void php_pqconn_event_conndestroy(PGEventConnDestroy *event, php_pqconn_event_data_t *data) +{ + PQsetInstanceData(event->conn, php_pqconn_event, NULL); + efree(data); +} +static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data) +{ + TSRMLS_DF(data); + + if (data->obj->onevent.fci.size > 0) { + zval *res; + + MAKE_STD_ZVAL(res); + res->type = IS_OBJECT; + res->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, event->result, NULL TSRMLS_CC); + + Z_ADDREF_P(res); + PQresultSetInstanceData(event->result, php_pqconn_event, res); + + zend_fcall_info_argn(&data->obj->onevent.fci TSRMLS_CC, 1, &res); + zend_fcall_info_call(&data->obj->onevent.fci, &data->obj->onevent.fcc, NULL, NULL TSRMLS_CC); + zval_ptr_dtor(&res); + } +} + +static int php_pqconn_event(PGEventId id, void *e, void *data) +{ + switch (id) { + case PGEVT_REGISTER: + php_pqconn_event_register(e, data); + break; + case PGEVT_CONNDESTROY: + php_pqconn_event_conndestroy(e, data); + break; + case PGEVT_RESULTCREATE: + php_pqconn_event_resultcreate(e, data); + break; + default: + break; + } + + return 1; +} + +static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj TSRMLS_DC) +{ + php_pqconn_event_data_t *data = emalloc(sizeof(*data)); + + data->obj = obj; + TSRMLS_CF(data); + + return data; +} + ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, async) @@ -797,17 +923,19 @@ static PHP_METHOD(pqconn, __construct) { zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &dsn_str, &dsn_len, &async)) { php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_pqconn_event_data_t *data = php_pqconn_event_data_init(obj TSRMLS_CC); if (obj->conn) { PQfinish(obj->conn); } - if ((obj->async = async)) { + if (async) { obj->conn = PQconnectStart(dsn_str); obj->poller = (int (*)(PGconn*)) PQconnectPoll; } else { obj->conn = PQconnectdb(dsn_str); } + PQregisterEventProc(obj->conn, php_pqconn_event, "ext-pq", data); if (SUCCESS != php_pqconn_update_socket(getThis(), obj TSRMLS_CC)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed: %s", PQerrorMessage(obj->conn)); } @@ -822,50 +950,48 @@ static PHP_METHOD(pqconn, reset) { php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); if (obj->conn) { - if (obj->async) { - if (PQresetStart(obj->conn)) { - obj->poller = (int (*)(PGconn*)) PQresetPoll; - RETURN_TRUE; - } + PQreset(obj->conn); + + if (CONNECTION_OK == PQstatus(obj->conn)) { + RETURN_TRUE; } else { - PQreset(obj->conn); - - if (CONNECTION_OK == PQstatus(obj->conn)) { - RETURN_TRUE; - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection reset failed: %s", PQerrorMessage(obj->conn)); - } + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection reset failed: %s", PQerrorMessage(obj->conn)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); } RETURN_FALSE; } } -static void listener_dtor(void *l) { - php_pqconn_listener_t *listener = l; - - zend_fcall_info_args_clear(&listener->fci, 1); +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset_async, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, resetAsync) { + if (SUCCESS == zend_parse_parameters_none()) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - zval_ptr_dtor(&listener->fci.function_name); - if (listener->fci.object_ptr) { - zval_ptr_dtor(&listener->fci.object_ptr); + if (obj->conn) { + if (PQresetStart(obj->conn)) { + obj->poller = (int (*)(PGconn*)) PQresetPoll; + RETURN_TRUE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + } + RETURN_FALSE; } } -static void php_pqconn_add_listener(php_pqconn_object_t *obj, const char *channel_str, size_t channel_len, php_pqconn_listener_t *listener TSRMLS_DC) +static void php_pqconn_add_listener(php_pqconn_object_t *obj, const char *channel_str, size_t channel_len, php_pq_callback_t *listener TSRMLS_DC) { HashTable ht, *existing_listeners; - Z_ADDREF_P(listener->fci.function_name); - if (listener->fci.object_ptr) { - Z_ADDREF_P(listener->fci.object_ptr); - } + php_pq_callback_addref(listener); + if (SUCCESS == zend_hash_find(&obj->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) { zend_hash_next_index_insert(existing_listeners, (void *) listener, sizeof(*listener), NULL); } else { - zend_hash_init(&ht, 1, NULL, (dtor_func_t) listener_dtor, 0); + zend_hash_init(&ht, 1, NULL, (dtor_func_t) php_pq_callback_dtor, 0); zend_hash_next_index_insert(&ht, (void *) listener, sizeof(*listener), NULL); zend_hash_add(&obj->listeners, channel_str, channel_len + 1, (void *) &ht, sizeof(HashTable), NULL); } @@ -891,7 +1017,7 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(pqconn, listen) { char *channel_str = NULL; int channel_len = 0; - php_pqconn_listener_t listener; + php_pq_callback_t listener; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) { php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); @@ -899,33 +1025,41 @@ static PHP_METHOD(pqconn, listen) { obj->poller = PQconsumeInput; if (obj->conn) { - PGresult *res; - char cmd[1024]; + char *quoted_channel = PQescapeIdentifier(obj->conn, channel_str, channel_len); - slprintf(cmd, sizeof(cmd), "LISTEN %s", channel_str); - res = PQexec(obj->conn, cmd); + if (quoted_channel) { + PGresult *res; + char *cmd; - if (res) { - if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { - php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC); - RETVAL_TRUE; + spprintf(&cmd, 0, "LISTEN %s", channel_str); + res = PQexec(obj->conn, cmd); + + efree(cmd); + PQfreemem(quoted_channel); + + + if (res) { + if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { + php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC); + RETVAL_TRUE; + } else { + RETVAL_FALSE; + } + PQclear(res); } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener: %s", PQerrorMessage(obj->conn)); RETVAL_FALSE; } - PQclear(res); + + php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener: %s", PQerrorMessage(obj->conn)); - RETVAL_FALSE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape channel identifier: %s", PQerrorMessage(obj->conn)); } - - php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); RETVAL_FALSE; } } - } ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify, 0, 0, 2) @@ -960,7 +1094,7 @@ static PHP_METHOD(pqconn, notify) { php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); RETVAL_FALSE; } } @@ -977,6 +1111,7 @@ static PHP_METHOD(pqconn, poll) { if (obj->poller == PQconsumeInput) { RETVAL_LONG(obj->poller(obj->conn) * PGRES_POLLING_OK); php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); + return; } else { RETURN_LONG(obj->poller(obj->conn)); } @@ -984,7 +1119,7 @@ static PHP_METHOD(pqconn, poll) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active"); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); } RETURN_FALSE; } @@ -1016,7 +1151,71 @@ static PHP_METHOD(pqconn, exec) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_get_result, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, getResult) { + if (SUCCESS == zend_parse_parameters_none()) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + PGresult *res = PQgetResult(obj->conn); + + if (res) { + return_value->type = IS_OBJECT; + return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC); + } else { + RETVAL_NULL(); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_async, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, callable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, execAsync) { + zend_error_handling zeh; + php_pq_callback_t resolver; + char *query_str; + int query_len; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|f", &query_str, &query_len, &resolver.fci, &resolver.fcc)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + php_pq_callback_dtor(&obj->onevent); + if (resolver.fci.size > 0) { + obj->onevent = resolver; + php_pq_callback_addref(&obj->onevent); + } + + obj->poller = PQconsumeInput; + + if (PQsendQuery(obj->conn, query_str)) { + if (zend_is_true(zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) { + if (!PQsetSingleRowMode(obj->conn)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn)); + } + } + RETVAL_TRUE; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; } } zend_restore_error_handling(&zeh TSRMLS_CC); @@ -1067,6 +1266,39 @@ static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_k return ZEND_HASH_APPLY_KEEP; } +static int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) +{ + int count = zend_hash_num_elements(ht); + + *types = NULL; + + if (count) { + Oid *tmp; + + /* +1 for when less types than params are specified */ + *types = tmp = ecalloc(count + 1, sizeof(Oid)); + zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC); + } + + return count; +} + +static int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC) +{ + int count = zend_hash_num_elements(ht); + + *params = NULL; + + if (count) { + char **tmp; + + *params = tmp = ecalloc(count, sizeof(char *)); + zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param, 2, &tmp, zdtor); + } + + return count; +} + ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params, 0, 0, 2) ZEND_ARG_INFO(0, query) ZEND_ARG_ARRAY_INFO(0, params, 0) @@ -1085,24 +1317,16 @@ static PHP_METHOD(pqconn, execParams) { if (obj->conn) { PGresult *res; - int count = 0; + int count; Oid *types = NULL; char **params = NULL; HashTable zdtor; ZEND_INIT_SYMTABLE(&zdtor); + count = php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &zdtor TSRMLS_CC); - if (ztypes && zend_hash_num_elements(Z_ARRVAL_P(ztypes))) { - Oid *tmp; - - tmp = types = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(ztypes)), sizeof(Oid)); - zend_hash_apply_with_argument(Z_ARRVAL_P(ztypes), apply_to_oid, &tmp TSRMLS_CC); - } - if ((count = zend_hash_num_elements(Z_ARRVAL_P(zparams)))) { - char **tmp; - - tmp = params = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(zparams)), sizeof(char *)); - zend_hash_apply_with_arguments(Z_ARRVAL_P(zparams) TSRMLS_CC, apply_to_param, 2, &tmp, &zdtor); + if (ztypes) { + php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC); } res = PQexecParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0); @@ -1124,50 +1348,122 @@ static PHP_METHOD(pqconn, execParams) { } } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; } } zend_restore_error_handling(&zeh TSRMLS_CC); } -static STATUS php_pqconn_prepare(PGconn *conn, const char *name, const char *query, HashTable *typest TSRMLS_DC) +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params_async, 0, 0, 2) + ZEND_ARG_INFO(0, query) + ZEND_ARG_ARRAY_INFO(0, params, 0) + ZEND_ARG_ARRAY_INFO(0, types, 1) + ZEND_ARG_INFO(0, callable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, execParamsAsync) { + zend_error_handling zeh; + php_pq_callback_t resolver; + char *query_str; + int query_len; + zval *zparams; + zval *ztypes = NULL; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!f", &query_str, &query_len, &zparams, &ztypes, &resolver.fci, &resolver.fcc)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + int count; + Oid *types = NULL; + char **params = NULL; + HashTable zdtor; + + ZEND_INIT_SYMTABLE(&zdtor); + count = php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &zdtor TSRMLS_CC); + + if (ztypes) { + php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC); + } + + php_pq_callback_dtor(&obj->onevent); + if (resolver.fci.size > 0) { + obj->onevent = resolver; + php_pq_callback_addref(&obj->onevent); + } + + obj->poller = PQconsumeInput; + + if (PQsendQueryParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) { + if (zend_is_true(zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) { + if (!PQsetSingleRowMode(obj->conn)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn)); + } + } + RETVAL_TRUE; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } + + zend_hash_destroy(&zdtor); + if (types) { + efree(types); + } + if (params) { + efree(params); + } + + php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); + + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +static STATUS php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, const char *name, const char *query, HashTable *typest TSRMLS_DC) { Oid *types = NULL; int count = 0; PGresult *res; + STATUS rv; - if (typest && (count = zend_hash_num_elements(typest))) { - Oid *tmp; - - tmp = types = ecalloc(count, sizeof(Oid)); - zend_hash_apply_with_argument(typest, apply_to_oid, &tmp TSRMLS_CC); + if (!obj) { + obj = zend_object_store_get_object(object TSRMLS_CC); } - res = PQprepare(conn, name, query, count, types); + if (typest) { + count = zend_hash_num_elements(typest); + php_pq_types_to_array(typest, &types TSRMLS_CC); + } + + res = PQprepare(obj->conn, name, query, count, types); if (types) { efree(types); } if (res) { - if (PGRES_COMMAND_OK == PQresultStatus(res)) { - return SUCCESS; - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQresultErrorMessage(res)); - } + rv = php_pqres_success(res TSRMLS_CC); PQclear(res); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(conn)); + rv = FAILURE; + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn)); } - return FAILURE; + + return rv; } ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare, 0, 0, 2) - ZEND_ARG_INFO(0, "name") - ZEND_ARG_INFO(0, "query") - ZEND_ARG_ARRAY_INFO(0, "types", 1) + ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, query) + ZEND_ARG_ARRAY_INFO(0, types, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(pqconn, prepare) { zend_error_handling zeh; @@ -1180,12 +1476,186 @@ static PHP_METHOD(pqconn, prepare) { php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); if (obj->conn) { - if (SUCCESS == php_pqconn_prepare(obj->conn, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { + if (SUCCESS == php_pqconn_prepare(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { + return_value->type = IS_OBJECT; + return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC); + } + php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, const char *name, const char *query, HashTable *typest TSRMLS_DC) +{ + STATUS rv; + int count; + Oid *types = NULL; + + if (!obj) { + obj = zend_object_store_get_object(object TSRMLS_CC); + } + + if (typest) { + count = php_pq_types_to_array(typest, &types TSRMLS_CC); + } + + if (PQsendPrepare(obj->conn, name, query, count, types)) { + if (zend_is_true(zend_read_property(Z_OBJCE_P(object), object, ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) { + if (!PQsetSingleRowMode(obj->conn)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn)); + } + } + rv = SUCCESS; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn)); + rv = FAILURE; + } + + if (types) { + efree(types); + } + + return rv; +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare_async, 0, 0, 2) +ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, query) + ZEND_ARG_ARRAY_INFO(0, types, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, prepareAsync) { + zend_error_handling zeh; + zval *ztypes = NULL; + char *name_str, *query_str; + int name_len, *query_len; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!", &name_str, &name_len, &query_str, &query_len, &ztypes)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + obj->poller = PQconsumeInput; + if (SUCCESS == php_pqconn_prepare_async(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { return_value->type = IS_OBJECT; return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC); } + php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote, 0, 0, 1) + ZEND_ARG_INFO(0, string) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, quote) { + char *str; + int len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + char *quoted = PQescapeLiteral(obj->conn, str, len); + + if (quoted) { + RETVAL_STRING(quoted, 1); + PQfreemem(quoted); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote string: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote_name, 0, 0, 1) + ZEND_ARG_INFO(0, name) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, quoteName) { + char *str; + int len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + char *quoted = PQescapeIdentifier(obj->conn, str, len); + + if (quoted) { + RETVAL_STRING(quoted, 1); + PQfreemem(quoted); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote name: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_escape_bytea, 0, 0, 1) + ZEND_ARG_INFO(0, bytea) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, escapeBytea) { + char *str; + int len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + size_t escaped_len; + char *escaped_str = (char *) PQescapeByteaConn(obj->conn, (unsigned char *) str, len, &escaped_len); + + if (escaped_str) { + RETVAL_STRINGL(escaped_str, escaped_len - 1, 1); + PQfreemem(escaped_str); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape bytea: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unescape_bytea, 0, 0, 1) + ZEND_ARG_INFO(0, bytea) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, unescapeBytea) { + char *str; + int len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn) { + size_t unescaped_len; + char *unescaped_str = (char *) PQunescapeBytea((unsigned char *)str, &unescaped_len); + + if (unescaped_str) { + RETVAL_STRINGL(unescaped_str, unescaped_len, 1); + PQfreemem(unescaped_str); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape bytea: %s", PQerrorMessage(obj->conn)); + RETVAL_FALSE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; } } } @@ -1193,12 +1663,21 @@ static PHP_METHOD(pqconn, prepare) { static zend_function_entry php_pqconn_methods[] = { PHP_ME(pqconn, __construct, ai_pqconn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(pqconn, reset, ai_pqconn_reset, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, resetAsync, ai_pqconn_reset_async, ZEND_ACC_PUBLIC) PHP_ME(pqconn, poll, ai_pqconn_poll, ZEND_ACC_PUBLIC) PHP_ME(pqconn, exec, ai_pqconn_exec, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, execAsync, ai_pqconn_exec_async, ZEND_ACC_PUBLIC) PHP_ME(pqconn, execParams, ai_pqconn_exec_params, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, execParamsAsync, ai_pqconn_exec_params_async, ZEND_ACC_PUBLIC) PHP_ME(pqconn, prepare, ai_pqconn_prepare, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, prepareAsync, ai_pqconn_prepare_async, ZEND_ACC_PUBLIC) PHP_ME(pqconn, listen, ai_pqconn_listen, ZEND_ACC_PUBLIC) PHP_ME(pqconn, notify, ai_pqconn_notify, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, getResult, ai_pqconn_get_result, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, quote, ai_pqconn_quote, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, quoteName, ai_pqconn_quote_name, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, escapeBytea, ai_pqconn_escape_bytea, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, unescapeBytea, ai_pqconn_unescape_bytea, ZEND_ACC_PUBLIC) {0} }; @@ -1260,7 +1739,7 @@ static zval **column_at(zval *row, int col TSRMLS_DC) } zend_hash_get_current_data(ht, (void *) &data); } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Column index %d does excess column count %d", col, count); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Column index %d exceeds column count %d", col, count); } return data; } @@ -1300,36 +1779,49 @@ static zend_function_entry php_pqres_methods[] = { }; ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_construct, 0, 0, 3) - ZEND_ARG_OBJ_INFO(0, "Connection", "pq\\Connection", 0) - ZEND_ARG_INFO(0, "name") - ZEND_ARG_INFO(0, "query") - ZEND_ARG_ARRAY_INFO(0, "types", 1) + ZEND_ARG_OBJ_INFO(0, Connection, pq\\Connection, 0) + ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, query) + ZEND_ARG_ARRAY_INFO(0, types, 1) + ZEND_ARG_INFO(0, async) ZEND_END_ARG_INFO(); static PHP_METHOD(pqstm, __construct) { zend_error_handling zeh; zval *zconn, *ztypes = NULL; char *name_str, *query_str; int name_len, *query_len; + zend_bool async = 0; zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oss|a/!", &zconn, php_pqconn_class_entry, &name_str, &name_len, &query_str, &query_len, &ztypes)) { + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oss|a/!b", &zconn, php_pqconn_class_entry, &name_str, &name_len, &query_str, &query_len, &ztypes, &async)) { php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); - php_pqconn_object_t *conn_obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); if (conn_obj->conn) { - if (SUCCESS == php_pqconn_prepare(conn_obj->conn, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { - Z_ADDREF_P(zconn); - obj->conn = zconn; - obj->name = estrdup(name_str); + if (async) { + conn_obj->poller = PQconsumeInput; + if (SUCCESS == php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { + Z_ADDREF_P(zconn); + obj->conn = zconn; + obj->name = estrdup(name_str); + } + } else { + if (SUCCESS == php_pqconn_prepare(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) { + Z_ADDREF_P(zconn); + obj->conn = zconn; + obj->name = estrdup(name_str); + } + php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); } } + zend_restore_error_handling(&zeh TSRMLS_CC); } ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_exec, 0, 0, 0) - ZEND_ARG_ARRAY_INFO(0, "params", 1) + ZEND_ARG_ARRAY_INFO(0, params, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(pqstm, exec) { zend_error_handling zeh; @@ -1348,13 +1840,9 @@ static PHP_METHOD(pqstm, exec) { HashTable zdtor; PGresult *res; - ZEND_INIT_SYMTABLE(&zdtor); - - if (zparams && (count = zend_hash_num_elements(Z_ARRVAL_P(zparams)))) { - char **tmp; - - tmp = params = ecalloc(count, sizeof(char *)); - zend_hash_apply_with_arguments(Z_ARRVAL_P(zparams) TSRMLS_CC, apply_to_param, 2, &tmp, &zdtor); + if (zparams) { + ZEND_INIT_SYMTABLE(&zdtor); + count = php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &zdtor TSRMLS_CC); } res = PQexecPrepared(conn_obj->conn, obj->name, count, (const char *const*) params, NULL, NULL, 0); @@ -1362,7 +1850,11 @@ static PHP_METHOD(pqstm, exec) { if (params) { efree(params); } - zend_hash_destroy(&zdtor); + if (zparams) { + zend_hash_destroy(&zdtor); + } + + php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); if (res) { if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { @@ -1373,10 +1865,77 @@ static PHP_METHOD(pqstm, exec) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_exec_async, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, params, 1) + ZEND_ARG_INFO(0, callable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqstm, execAsync) { + zend_error_handling zeh; + zval *zparams = NULL; + php_pq_callback_t resolver; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!f", &zparams, &resolver.fci, &resolver.fcc)) { + php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->conn && obj->name) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->conn TSRMLS_CC); + + if (conn_obj->conn) { + int count; + char **params = NULL; + HashTable zdtor; + + if (zparams) { + ZEND_INIT_SYMTABLE(&zdtor); + count = php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &zdtor TSRMLS_CC); + } + + php_pq_callback_dtor(&conn_obj->onevent); + if (resolver.fci.size > 0) { + conn_obj->onevent = resolver; + php_pq_callback_addref(&conn_obj->onevent); + } + + conn_obj->poller = PQconsumeInput; + + if (PQsendQueryPrepared(conn_obj->conn, obj->name, count, (const char *const*) params, NULL, NULL, 0)) { + if (zend_is_true(zend_read_property(Z_OBJCE_P(obj->conn), obj->conn, ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) { + if (!PQsetSingleRowMode(conn_obj->conn)) { + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(conn_obj->conn)); + } + } + RETVAL_TRUE; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn)); + RETVAL_FALSE; + } + + if (params) { + efree(params); + } + if (zparams) { + zend_hash_destroy(&zdtor); + } + + php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); + + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + RETVAL_FALSE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized"); + RETVAL_FALSE; } } zend_restore_error_handling(&zeh TSRMLS_CC); @@ -1397,6 +1956,8 @@ static PHP_METHOD(pqstm, desc) { if (conn_obj->conn) { PGresult *res = PQdescribePrepared(conn_obj->conn, obj->name); + php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); + if (res) { if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { int p, params; @@ -1410,10 +1971,10 @@ static PHP_METHOD(pqstm, desc) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(conn_obj->conn)); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); } } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized"); } } zend_restore_error_handling(&zeh TSRMLS_CC); @@ -1423,6 +1984,7 @@ static zend_function_entry php_pqstm_methods[] = { PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) 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) {0} }; @@ -1438,10 +2000,11 @@ PHP_MINIT_FUNCTION(pq) php_pqconn_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); php_pqconn_class_entry->create_object = php_pqconn_create_object; memcpy(&php_pqconn_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_pqconn_object_handlers.read_property = php_pqconn_object_read_prop; - php_pqconn_object_handlers.write_property = php_pqconn_object_write_prop; + php_pqconn_object_handlers.read_property = php_pq_object_read_prop; + php_pqconn_object_handlers.write_property = php_pq_object_write_prop; php_pqconn_object_handlers.clone_obj = NULL; php_pqconn_object_handlers.get_property_ptr_ptr = NULL; + php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info; zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC); ph.read = php_pqconn_object_read_status; @@ -1463,6 +2026,18 @@ PHP_MINIT_FUNCTION(pq) ph.read = php_pqconn_object_read_types; zend_hash_add(&php_pqconn_object_prophandlers, "types", sizeof("types"), (void *) &ph, sizeof(ph), NULL); + zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("busy"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqconn_object_read_busy; + zend_hash_add(&php_pqconn_object_prophandlers, "busy", sizeof("busy"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("encoding"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqconn_object_read_encoding; + ph.write = php_pqconn_object_write_encoding; + zend_hash_add(&php_pqconn_object_prophandlers, "encoding", sizeof("encoding"), (void *) &ph, sizeof(ph), NULL); + ph.write = NULL; + + zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("unbuffered"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK TSRMLS_CC); zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD TSRMLS_CC); zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("STARTED"), CONNECTION_STARTED TSRMLS_CC); @@ -1492,8 +2067,11 @@ PHP_MINIT_FUNCTION(pq) php_pqres_class_entry->get_iterator = php_pqres_iterator_init; memcpy(&php_pqres_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_pqres_object_handlers.read_property = php_pqres_object_read_prop; - php_pqres_object_handlers.write_property = php_pqres_object_write_prop; + php_pqres_object_handlers.read_property = php_pq_object_read_prop; + php_pqres_object_handlers.write_property = php_pq_object_write_prop; + php_pqres_object_handlers.clone_obj = NULL; + php_pqres_object_handlers.get_property_ptr_ptr = NULL; + php_pqres_object_handlers.get_debug_info = php_pq_object_debug_info; zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC TSRMLS_CC); ph.read = php_pqres_object_read_status; @@ -1543,8 +2121,11 @@ PHP_MINIT_FUNCTION(pq) php_pqstm_class_entry->create_object = php_pqstm_create_object; memcpy(&php_pqstm_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_pqstm_object_handlers.read_property = php_pqstm_object_read_prop; - php_pqstm_object_handlers.write_property = php_pqstm_object_write_prop; + php_pqstm_object_handlers.read_property = php_pq_object_read_prop; + php_pqstm_object_handlers.write_property = php_pq_object_write_prop; + php_pqstm_object_handlers.clone_obj = NULL; + php_pqstm_object_handlers.get_property_ptr_ptr = NULL; + php_pqstm_object_handlers.get_debug_info = php_pq_object_debug_info; zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC TSRMLS_CC); ph.read = php_pqstm_object_read_name;