X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq.c;h=64c9ce181db466a6aa89f9a661c3a3eb7c64a272;hp=d1041e68a13515e2288632fb96b2700c5c18c3d9;hb=01a3a98f9a7fa77699a21ed9fe39b5f5eff3b0c3;hpb=386aa8e34c335e4aa45a8bdd210baad347550265 diff --git a/src/php_pq.c b/src/php_pq.c index d1041e6..64c9ce1 100644 --- a/src/php_pq.c +++ b/src/php_pq.c @@ -20,6 +20,7 @@ #include #include +#include #include "php_pq.h" @@ -29,29 +30,6 @@ typedef int STATUS; /* SUCCESS/FAILURE */ ZEND_DECLARE_MODULE_GLOBALS(pq) */ -const zend_function_entry pq_functions[] = { - {0} -}; - -/* {{{ pq_module_entry - */ -zend_module_entry pq_module_entry = { - STANDARD_MODULE_HEADER, - "pq", - pq_functions, - PHP_MINIT(pq), - PHP_MSHUTDOWN(pq), - NULL,/*PHP_RINIT(pq),*/ - NULL,/*PHP_RSHUTDOWN(pq),*/ - PHP_MINFO(pq), - PHP_PQ_EXT_VERSION, - STANDARD_MODULE_PROPERTIES -}; -/* }}} */ - -#ifdef COMPILE_DL_PQ -ZEND_GET_MODULE(pq) -#endif /* {{{ PHP_INI */ @@ -77,10 +55,12 @@ static void php_pq_init_globals(zend_pq_globals *pq_globals) static zend_class_entry *php_pqconn_class_entry; static zend_class_entry *php_pqres_class_entry; static zend_class_entry *php_pqstm_class_entry; +static zend_class_entry *php_pqtxn_class_entry; static zend_object_handlers php_pqconn_object_handlers; static zend_object_handlers php_pqres_object_handlers; static zend_object_handlers php_pqstm_object_handlers; +static zend_object_handlers php_pqtxn_object_handlers; typedef struct php_pq_callback { zend_fcall_info fci; @@ -88,11 +68,11 @@ typedef struct php_pq_callback { void *data; } php_pq_callback_t; -typedef struct php_pqbase_object { +typedef struct php_pq_object { zend_object zo; void *intern; HashTable *prophandler; -} php_pqbase_object_t; +} php_pq_object_t; typedef struct php_pqconn_object { zend_object zo; @@ -102,7 +82,6 @@ typedef struct php_pqconn_object { int (*poller)(PGconn *); HashTable listeners; php_pq_callback_t onevent; - unsigned async:1; } php_pqconn_object_t; typedef struct php_pqconn_event_data { @@ -133,17 +112,40 @@ typedef struct php_pqres_object { php_pqres_iterator_t *iter; } php_pqres_object_t; +typedef struct php_pqstm { + zval *conn; + char *name; +} php_pqstm_t; + typedef struct php_pqstm_object { zend_object zo; - char *name; + php_pqstm_t *stm; HashTable *prophandler; +} php_pqstm_object_t; +typedef enum php_pqtxn_isolation { + PHP_PQTXN_READ_COMMITTED, + PHP_PQTXN_REPEATABLE_READ, + PHP_PQTXN_SERIALIZABLE, +} php_pqtxn_isolation_t; + +typedef struct php_pqtxn { zval *conn; -} php_pqstm_object_t; + php_pqtxn_isolation_t isolation; + unsigned readonly:1; + unsigned deferrable:1; +} php_pqtxn_t; + +typedef struct php_pqtxn_object { + zend_object zo; + php_pqtxn_t *txn; + HashTable *prophandler; +} php_pqtxn_object_t; static HashTable php_pqconn_object_prophandlers; static HashTable php_pqres_object_prophandlers; static HashTable php_pqstm_object_prophandlers; +static HashTable php_pqtxn_object_prophandlers; typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC); @@ -310,6 +312,19 @@ static zend_object_iterator_funcs php_pqres_iterator_funcs = { NULL }; +static STATUS php_pqres_success(PGresult *res TSRMLS_DC) +{ + switch (PQresultStatus(res)) { + case PGRES_BAD_RESPONSE: + case PGRES_NONFATAL_ERROR: + case PGRES_FATAL_ERROR: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", PQresultErrorMessage(res)); + return FAILURE; + default: + return SUCCESS; + } +} + static void php_pq_callback_dtor(php_pq_callback_t *cb) { if (cb->fci.size > 0) { zend_fcall_info_args_clear(&cb->fci, 1); @@ -373,13 +388,25 @@ static void php_pqstm_object_free(void *o TSRMLS_DC) { php_pqstm_object_t *obj = o; - if (obj->name) { - efree(obj->name); - obj->name = NULL; + if (obj->stm) { + zval_ptr_dtor(&obj->stm->conn); + efree(obj->stm->name); + efree(obj->stm); + obj->stm = NULL; } - if (obj->conn) { - zval_ptr_dtor(&obj->conn); - obj->conn = NULL; + zend_object_std_dtor((zend_object *) o TSRMLS_CC); + efree(obj); +} + +static void php_pqtxn_object_free(void *o TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + + if (obj->txn) { + zval_ptr_dtor(&obj->txn->conn); + obj->txn->conn = NULL; + efree(obj->txn); + obj->txn = NULL; } zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(obj); @@ -401,7 +428,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); @@ -436,7 +462,7 @@ static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresu return ov; } -static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval *conn, const char *name, php_pqstm_object_t **ptr TSRMLS_DC) +static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, php_pqstm_t *stm, php_pqstm_object_t **ptr TSRMLS_DC) { zend_object_value ov; php_pqstm_object_t *o; @@ -450,13 +476,8 @@ static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval * *ptr = o; } - if (conn) { - Z_ADDREF_P(conn); - o->conn = conn; - } - - if (name) { - o->name = estrdup(name); + if (stm) { + o->stm = stm; } ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqstm_object_free, NULL TSRMLS_CC); @@ -465,6 +486,30 @@ static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval * return ov; } +static zend_object_value php_pqtxn_create_object_ex(zend_class_entry *ce, php_pqtxn_t *txn, php_pqtxn_object_t **ptr TSRMLS_DC) +{ + zend_object_value ov; + php_pqtxn_object_t *o; + + 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_pqtxn_object_prophandlers; + + if (ptr) { + *ptr = o; + } + + if (txn) { + o->txn = txn; + } + + ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqtxn_object_free, NULL TSRMLS_CC); + ov.handlers = &php_pqtxn_object_handlers; + + return ov; +} + static zend_object_value php_pqconn_create_object(zend_class_entry *class_type TSRMLS_DC) { return php_pqconn_create_object_ex(class_type, NULL, NULL TSRMLS_CC); @@ -477,7 +522,12 @@ static zend_object_value php_pqres_create_object(zend_class_entry *class_type TS static zend_object_value php_pqstm_create_object(zend_class_entry *class_type TSRMLS_DC) { - return php_pqstm_create_object_ex(class_type, NULL, NULL, NULL TSRMLS_CC); + return php_pqstm_create_object_ex(class_type, NULL, NULL TSRMLS_CC); +} + +static zend_object_value php_pqtxn_create_object(zend_class_entry *class_type TSRMLS_DC) +{ + return php_pqtxn_create_object_ex(class_type, NULL, NULL TSRMLS_CC); } static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) @@ -485,33 +535,34 @@ static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_has php_pq_object_prophandler_t *ph = p; HashTable *ht = va_arg(argv, HashTable *); zval **return_value, *object = va_arg(argv, zval *); - php_pqbase_object_t *obj = va_arg(argv, php_pqbase_object_t *); + php_pq_object_t *obj = va_arg(argv, php_pq_object_t *); if (SUCCESS == zend_hash_find(ht, key->arKey, key->nKeyLength, (void *) &return_value)) { + if (ph->read) { + zval_ptr_dtor(return_value); MAKE_STD_ZVAL(*return_value); ZVAL_NULL(*return_value); 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) +static int apply_pi_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) { zend_property_info *pi = p; - HashTable *ht = arg; + HashTable *ht = va_arg(argv, HashTable *); + zval *object = va_arg(argv, zval *); + php_pq_object_t *obj = va_arg(argv, php_pq_object_t *); + zval *property = zend_read_property(obj->zo.ce, object, pi->name, pi->name_length, 0 TSRMLS_CC); - zend_hash_add_empty_element(ht, pi->name, pi->name_length + 1); + if (!Z_REFCOUNT_P(property)) { + Z_ADDREF_P(property); + } + zend_hash_add(ht, pi->name, pi->name_length + 1, (void *) &property, sizeof(zval *), NULL); return ZEND_HASH_APPLY_KEEP; } @@ -519,13 +570,13 @@ static int apply_pi_to_debug(void *p, void *arg TSRMLS_DC) static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC) { HashTable *ht; - php_pqbase_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); + 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->zo.ce->properties_info TSRMLS_CC, apply_pi_to_debug, 3, ht, object, obj); zend_hash_apply_with_arguments(obj->prophandler TSRMLS_CC, apply_ph_to_debug, 3, ht, object, obj); return ht; @@ -579,11 +630,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; } @@ -597,7 +651,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); } } @@ -655,6 +709,31 @@ static void php_pqconn_object_read_busy(zval *object, void *o, zval *return_valu 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; @@ -715,6 +794,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) { @@ -726,112 +809,134 @@ static void php_pqstm_object_read_name(zval *object, void *o, zval *return_value { php_pqstm_object_t *obj = o; - RETVAL_STRING(obj->name, 1); + RETVAL_STRING(obj->stm->name, 1); } static void php_pqstm_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC) { php_pqstm_object_t *obj = o; - RETVAL_ZVAL(obj->conn, 1, 0); + RETVAL_ZVAL(obj->stm->conn, 1, 0); } -static zval *php_pqconn_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +static void php_pqtxn_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC) { - php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - zval *return_value; + php_pqtxn_object_t *obj = o; - 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); + RETVAL_ZVAL(obj->txn->conn, 1, 0); +} - 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); - } +static void php_pqtxn_object_read_isolation(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; - return return_value; + RETVAL_LONG(obj->txn->isolation); } -static void php_pqconn_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +static void php_pqtxn_object_read_readonly(zval *object, void *o, zval *return_value TSRMLS_DC) { - php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; + php_pqtxn_object_t *obj = o; - 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); - } + RETVAL_LONG(obj->txn->readonly); } -static zval *php_pqres_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC) +static void php_pqtxn_object_read_deferrable(zval *object, void *o, zval *return_value TSRMLS_DC) { - php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; - zval *return_value; + php_pqtxn_object_t *obj = o; - 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); + RETVAL_LONG(obj->txn->deferrable); +} - 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; - } +static void php_pqtxn_object_write_isolation(zval *object, void *o, zval *value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + php_pqtxn_isolation_t orig = obj->txn->isolation; + zval *zisolation = value; + PGresult *res; + + if (Z_TYPE_P(zisolation) != IS_LONG) { + convert_to_long_ex(&zisolation); + } + + switch ((obj->txn->isolation = Z_LVAL_P(zisolation))) { + case PHP_PQTXN_READ_COMMITTED: + res = PQexec(conn_obj->conn, "SET TRANSACTION READ COMMITED"); + break; + case PHP_PQTXN_REPEATABLE_READ: + res = PQexec(conn_obj->conn, "SET TRANSACTION REPEATABLE READ"); + break; + case PHP_PQTXN_SERIALIZABLE: + res = PQexec(conn_obj->conn, "SET TRANSACTION SERIALIZABLE"); + break; + default: + obj->txn->isolation = orig; + res = NULL; + break; + } + + if (zisolation != value) { + zval_ptr_dtor(&zisolation); + } + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } +} + +static void php_pqtxn_object_write_readonly(zval *object, void *o, zval *value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + PGresult *res; + + if ((obj->txn->readonly = zend_is_true(value))) { + res = PQexec(conn_obj->conn, "SET TRANSACTION READ ONLY"); } else { - return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC); + res = PQexec(conn_obj->conn, "SET TRANSACTION READ WRITE"); } - return return_value; + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } } -static void php_pqres_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC) +static void php_pqtxn_object_write_deferrable(zval *object, void *o, zval *value TSRMLS_DC) { - php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC); - php_pq_object_prophandler_t *handler; + php_pqtxn_object_t *obj = o; + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + PGresult *res; - 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); - } + if ((obj->txn->deferrable = zend_is_true(value))) { + res = PQexec(conn_obj->conn, "SET TRANSACTION DEFERRABLE"); } else { - zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC); + res = PQexec(conn_obj->conn, "SET TRANSACTION NOT DEFERRABLE"); + } + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } +} + +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); @@ -839,7 +944,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 { @@ -849,14 +954,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); } @@ -961,6 +1064,17 @@ static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t * return data; } +static void php_pqconn_notice_recv(void *o, const PGresult *res) +{ + php_pqconn_object_t *obj = o; + zval *notice; + + return; + + MAKE_STD_ZVAL(notice); + ZVAL_STRING(notice, PQerrorMessage(res), 1); +} + ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, async) @@ -979,13 +1093,13 @@ static PHP_METHOD(pqconn, __construct) { 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); } - + PQsetNoticeReceiver(obj->conn, php_pqconn_notice_recv, obj); 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)); @@ -1001,22 +1115,33 @@ 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, "pq\\Connection not initialized"); + } + RETURN_FALSE; + } +} + +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); + + if (obj->conn) { + if (PQresetStart(obj->conn)) { + obj->poller = (int (*)(PGconn*)) PQresetPoll; + RETURN_TRUE; } } 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; } @@ -1037,19 +1162,6 @@ static void php_pqconn_add_listener(php_pqconn_object_t *obj, const char *channe } } -static STATUS php_pqres_success(PGresult *res TSRMLS_DC) -{ - switch (PQresultStatus(res)) { - case PGRES_BAD_RESPONSE: - case PGRES_NONFATAL_ERROR: - case PGRES_FATAL_ERROR: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", PQresultErrorMessage(res)); - return FAILURE; - default: - return SUCCESS; - } -} - ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_listen, 0, 0, 0) ZEND_ARG_INFO(0, channel) ZEND_ARG_INFO(0, callable) @@ -1065,29 +1177,38 @@ 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; } } @@ -1125,7 +1246,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; } } @@ -1150,7 +1271,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; } @@ -1182,13 +1303,13 @@ 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_getResult, 0, 0, 0) +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()) { @@ -1204,7 +1325,7 @@ static PHP_METHOD(pqconn, getResult) { RETVAL_NULL(); } } 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; } } @@ -1234,13 +1355,18 @@ static PHP_METHOD(pqconn, execAsync) { 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, "Connection not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); RETVAL_FALSE; } } @@ -1292,28 +1418,37 @@ static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_k return ZEND_HASH_APPLY_KEEP; } -static void php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) +static int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) { + int count = zend_hash_num_elements(ht); + *types = NULL; - if (zend_hash_num_elements(ht)) { + if (count) { Oid *tmp; - *types = tmp = ecalloc(zend_hash_num_elements(ht) + 1, sizeof(Oid)); + /* +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 void php_pq_params_to_array(HashTable *ht, char ***params, int *count, HashTable *zdtor TSRMLS_DC) +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 = zend_hash_num_elements(ht))) { + if (count) { char **tmp; - *params = tmp = ecalloc(*count, sizeof(char *)); + *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) @@ -1334,13 +1469,13 @@ 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); - php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &count, &zdtor TSRMLS_CC); + 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); @@ -1368,7 +1503,7 @@ static PHP_METHOD(pqconn, execParams) { 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; } } @@ -1394,13 +1529,13 @@ static PHP_METHOD(pqconn, execParamsAsync) { php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); if (obj->conn) { - int count = 0; + int count; Oid *types = NULL; char **params = NULL; HashTable zdtor; ZEND_INIT_SYMTABLE(&zdtor); - php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &count, &zdtor TSRMLS_CC); + 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); @@ -1415,6 +1550,11 @@ static PHP_METHOD(pqconn, execParamsAsync) { 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)); @@ -1432,28 +1572,30 @@ static PHP_METHOD(pqconn, execParamsAsync) { 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_restore_error_handling(&zeh TSRMLS_CC); } -static STATUS php_pqconn_prepare(PGconn *conn, const char *name, const char *query, HashTable *typest TSRMLS_DC) +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); @@ -1464,9 +1606,9 @@ static STATUS php_pqconn_prepare(PGconn *conn, const char *name, const char *que PQclear(res); } else { rv = FAILURE; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(conn)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn)); } - + return rv; } @@ -1486,29 +1628,362 @@ 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)) { + php_pqstm_t *stm = ecalloc(1, sizeof(*stm)); + + stm->conn = getThis(); + Z_ADDREF_P(stm->conn); + stm->name = estrdup(name_str); + return_value->type = IS_OBJECT; - return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC); + return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, NULL TSRMLS_CC); } 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"); } } + zend_restore_error_handling(&zeh TSRMLS_CC); } -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, poll, ai_pqconn_poll, ZEND_ACC_PUBLIC) - PHP_ME(pqconn, exec, ai_pqconn_exec, ZEND_ACC_PUBLIC) - PHP_ME(pqconn, execParams, ai_pqconn_exec_params, ZEND_ACC_PUBLIC) - PHP_ME(pqconn, prepare, ai_pqconn_prepare, 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_getResult, ZEND_ACC_PUBLIC) +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)) { + php_pqstm_t *stm = ecalloc(1, sizeof(*stm)); + + stm->conn = getThis(); + Z_ADDREF_P(stm->conn); + stm->name = estrdup(name_str); + + return_value->type = IS_OBJECT; + return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, 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, "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; + } + } +} + +static const char *isolation_level(long *isolation) { + switch (*isolation) { + case PHP_PQTXN_SERIALIZABLE: + return "SERIALIZABLE"; + case PHP_PQTXN_REPEATABLE_READ: + return "REPEATABLE READ"; + default: + *isolation = PHP_PQTXN_READ_COMMITTED; + /* no break */ + case PHP_PQTXN_READ_COMMITTED: + return "READ COMMITTED"; + } +} + +static STATUS php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *conn_obj, long isolation, zend_bool readonly, zend_bool deferrable TSRMLS_DC) +{ + if (!conn_obj) { + conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); + } + + if (conn_obj->conn) { + PGresult *res; + char *cmd; + + spprintf(&cmd, 0, "START TRANSACTION ISOLATION LEVEL %s, READ %s, %s DEFERRABLE", + isolation_level(&isolation), readonly ? "ONLY" : "WRITE", deferrable ? "": "NOT"); + + res = PQexec(conn_obj->conn, cmd); + + efree(cmd); + + if (res) { + STATUS rv = php_pqres_success(res TSRMLS_CC); + + PQclear(res); + return rv; + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start transaction: %s", PQerrorMessage(conn_obj->conn)); + return FAILURE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + return FAILURE; + } +} + +static STATUS php_pqconn_start_transaction_async(zval *zconn, php_pqconn_object_t *conn_obj, long isolation, zend_bool readonly, zend_bool deferrable TSRMLS_DC) +{ + if (!conn_obj) { + conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); + } + + if (conn_obj->conn) { + char *cmd; + + spprintf(&cmd, 0, "START TRANSACTION ISOLATION LEVEL %s, READ %s, %s DEFERRABLE", + isolation_level(&isolation), readonly ? "ONLY" : "WRITE", deferrable ? "": "NOT"); + + if (PQsendQuery(conn_obj->conn, cmd)) { + conn_obj->poller = PQconsumeInput; + efree(cmd); + return SUCCESS; + } else { + efree(cmd); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start transaction: %s", PQerrorMessage(conn_obj->conn)); + return FAILURE; + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); + return FAILURE; + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_start_transaction, 0, 0, 0) + ZEND_ARG_INFO(0, isolation) + ZEND_ARG_INFO(0, readonly) + ZEND_ARG_INFO(0, deferrable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, startTransaction) { + zend_error_handling zeh; + long isolation = PHP_PQTXN_READ_COMMITTED; + zend_bool readonly = 0, deferrable = 0; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lbb", &isolation, &readonly, &deferrable)) { + STATUS rv; + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + rv = php_pqconn_start_transaction(getThis(), obj, isolation, readonly, deferrable TSRMLS_CC); + + if (SUCCESS == rv) { + php_pqtxn_t *txn = ecalloc(1, sizeof(*txn)); + + txn->conn = getThis(); + Z_ADDREF_P(txn->conn); + txn->isolation = isolation; + txn->readonly = readonly; + txn->deferrable = deferrable; + + return_value->type = IS_OBJECT; + return_value->value.obj = php_pqtxn_create_object_ex(php_pqtxn_class_entry, txn, NULL TSRMLS_CC); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + + +ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_start_transaction_async, 0, 0, 0) + ZEND_ARG_INFO(0, isolation) + ZEND_ARG_INFO(0, readonly) + ZEND_ARG_INFO(0, deferrable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqconn, startTransactionAsync) { + zend_error_handling zeh; + long isolation = PHP_PQTXN_READ_COMMITTED; + zend_bool readonly = 0, deferrable = 0; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lbb", &isolation, &readonly, &deferrable)) { + STATUS rv; + php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + rv = php_pqconn_start_transaction_async(getThis(), obj, isolation, readonly, deferrable TSRMLS_CC); + + if (SUCCESS == rv) { + php_pqtxn_t *txn = ecalloc(1, sizeof(*txn)); + + txn->conn = getThis(); + Z_ADDREF_P(txn->conn); + txn->isolation = isolation; + txn->readonly = readonly; + txn->deferrable = deferrable; + + return_value->type = IS_OBJECT; + return_value->value.obj = php_pqtxn_create_object_ex(php_pqtxn_class_entry, txn, NULL TSRMLS_CC); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +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) + PHP_ME(pqconn, startTransaction, ai_pqconn_start_transaction, ZEND_ACC_PUBLIC) + PHP_ME(pqconn, startTransactionAsync, ai_pqconn_start_transaction_async, ZEND_ACC_PUBLIC) {0} }; @@ -1570,7 +2045,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; } @@ -1614,29 +2089,43 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_construct, 0, 0, 3) 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(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); + STATUS rv; + if (async) { + conn_obj->poller = PQconsumeInput; + rv = php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC); + } else { + rv = php_pqconn_prepare(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC); + php_pqconn_notify_listeners(zconn, conn_obj TSRMLS_CC); + } + + if (SUCCESS == rv) { + php_pqstm_t *stm = ecalloc(1, sizeof(*stm)); + + stm->conn = zconn; + Z_ADDREF_P(stm->conn); + stm->name = estrdup(name_str); + obj->stm = stm; } - 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) @@ -1650,8 +2139,8 @@ static PHP_METHOD(pqstm, exec) { if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &zparams)) { 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 (obj->stm) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->stm->conn TSRMLS_CC); if (conn_obj->conn) { int count = 0; @@ -1659,23 +2148,21 @@ 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); + res = PQexecPrepared(conn_obj->conn, obj->stm->name, count, (const char *const*) params, NULL, NULL, 0); if (params) { efree(params); } - zend_hash_destroy(&zdtor); + if (zparams) { + zend_hash_destroy(&zdtor); + } - php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); + php_pqconn_notify_listeners(obj->stm->conn, conn_obj TSRMLS_CC); if (res) { if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { @@ -1686,10 +2173,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, "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->stm) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->stm->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->stm->name, count, (const char *const*) params, NULL, NULL, 0)) { + if (zend_is_true(zend_read_property(Z_OBJCE_P(obj->stm->conn), obj->stm->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->stm->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, "Statement not initialized"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized"); + RETVAL_FALSE; } } zend_restore_error_handling(&zeh TSRMLS_CC); @@ -1704,13 +2258,13 @@ static PHP_METHOD(pqstm, desc) { if (SUCCESS == zend_parse_parameters_none()) { 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 (obj->stm) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->stm->conn TSRMLS_CC); if (conn_obj->conn) { - PGresult *res = PQdescribePrepared(conn_obj->conn, obj->name); + PGresult *res = PQdescribePrepared(conn_obj->conn, obj->stm->name); - php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC); + php_pqconn_notify_listeners(obj->stm->conn, conn_obj TSRMLS_CC); if (res) { if (SUCCESS == php_pqres_success(res TSRMLS_CC)) { @@ -1725,10 +2279,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); @@ -1738,27 +2292,201 @@ 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} +}; + +ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_construct, 0, 0, 1) + ZEND_ARG_INFO(0, connection) + ZEND_ARG_INFO(0, async) + ZEND_ARG_INFO(0, isolation) + ZEND_ARG_INFO(0, readonly) + ZEND_ARG_INFO(0, deferrable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqtxn, __construct) { + zend_error_handling zeh; + zval *zconn; + long isolation = PHP_PQTXN_READ_COMMITTED; + zend_bool async = 0, readonly = 0, deferrable = 0; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|blbb", &zconn, php_pqconn_class_entry, &async, &isolation, &readonly, &deferrable)) { + STATUS rv; + php_pqtxn_object_t *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 (async) { + rv = php_pqconn_start_transaction_async(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC); + } else { + rv = php_pqconn_start_transaction(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC); + } + + if (SUCCESS == rv) { + if (obj->txn) { + zval_ptr_dtor(&obj->txn->conn); + efree(obj->txn); + } + Z_ADDREF_P(zconn); + obj->txn = ecalloc(1, sizeof(*obj->txn)); + obj->txn->conn = zconn; + obj->txn->isolation = isolation; + obj->txn->readonly = readonly; + obj->txn->deferrable = deferrable; + } + } 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_pqtxn_commit, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqtxn, commit) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->txn) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + + if (conn_obj->conn) { + PGresult *res = PQexec(conn_obj->conn, "COMMIT"); + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not commit transaction: %s", PQerrorMessage(conn_obj->conn)); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not intialized"); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_commit_async, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqtxn, commitAsync) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->txn) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + + if (conn_obj->conn) { + conn_obj->poller = PQconsumeInput; + + if (!PQsendQuery(conn_obj->conn, "COMMIT")) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not commit transaction: %s", PQerrorMessage(conn_obj->conn)); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not intialized"); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_rollback, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqtxn, rollback) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->txn) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + + if (conn_obj->conn) { + PGresult *res = PQexec(conn_obj->conn, "ROLLBACK"); + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not rollback transaction: %s", PQerrorMessage(conn_obj->conn)); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not intialized"); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_rollback_async, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqtxn, rollbackAsync) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->txn) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->txn->conn TSRMLS_CC); + + if (conn_obj->conn) { + conn_obj->poller = PQconsumeInput; + if (!PQsendQuery(conn_obj->conn, "REOLLBACK")) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not rollback transaction: %s", PQerrorMessage(conn_obj->conn)); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not intialized"); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +static zend_function_entry php_pqtxn_methods[] = { + PHP_ME(pqtxn, __construct, ai_pqtxn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(pqtxn, commit, ai_pqtxn_commit, ZEND_ACC_PUBLIC) + PHP_ME(pqtxn, rollback, ai_pqtxn_rollback, ZEND_ACC_PUBLIC) + PHP_ME(pqtxn, commitAsync, ai_pqtxn_commit_async, ZEND_ACC_PUBLIC) + PHP_ME(pqtxn, rollbackAsync, ai_pqtxn_rollback_async, ZEND_ACC_PUBLIC) {0} }; /* {{{ PHP_MINIT_FUNCTION */ -PHP_MINIT_FUNCTION(pq) +static PHP_MINIT_FUNCTION(pq) { zend_class_entry ce = {0}; php_pq_object_prophandler_t ph = {0}; - zend_hash_init(&php_pqconn_object_prophandlers, 1, NULL, NULL, 1); INIT_NS_CLASS_ENTRY(ce, "pq", "Connection", php_pqconn_methods); 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_hash_init(&php_pqconn_object_prophandlers, 8, NULL, NULL, 1); + 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; zend_hash_add(&php_pqconn_object_prophandlers, "status", sizeof("status"), (void *) &ph, sizeof(ph), NULL); @@ -1783,6 +2511,14 @@ PHP_MINIT_FUNCTION(pq) 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); @@ -1803,21 +2539,23 @@ PHP_MINIT_FUNCTION(pq) zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("POLLING_WRITING"), PGRES_POLLING_WRITING TSRMLS_CC); zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("POLLING_OK"), PGRES_POLLING_OK TSRMLS_CC); - zend_hash_init(&php_pqres_object_prophandlers, 1, NULL, NULL, 1); memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "pq", "Result", php_pqres_methods); php_pqres_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); php_pqres_class_entry->create_object = php_pqres_create_object; php_pqres_class_entry->iterator_funcs.funcs = &php_pqres_iterator_funcs; php_pqres_class_entry->get_iterator = php_pqres_iterator_init; + zend_class_implements(php_pqres_class_entry TSRMLS_CC, 1, zend_ce_traversable); 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_hash_init(&php_pqres_object_prophandlers, 6, NULL, NULL, 1); + zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC TSRMLS_CC); ph.read = php_pqres_object_read_status; zend_hash_add(&php_pqres_object_prophandlers, "status", sizeof("status"), (void *) &ph, sizeof(ph), NULL); @@ -1859,19 +2597,20 @@ PHP_MINIT_FUNCTION(pq) zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_ASSOC"), PHP_PQRES_FETCH_ASSOC TSRMLS_CC); zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_OBJECT"), PHP_PQRES_FETCH_OBJECT TSRMLS_CC); - zend_hash_init(&php_pqstm_object_prophandlers, 1, NULL, NULL, 1); memset(&ce, 0, sizeof(ce)); INIT_NS_CLASS_ENTRY(ce, "pq", "Statement", php_pqstm_methods); php_pqstm_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); 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_hash_init(&php_pqstm_object_prophandlers, 2, NULL, NULL, 1); + zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC TSRMLS_CC); ph.read = php_pqstm_object_read_name; zend_hash_add(&php_pqstm_object_prophandlers, "name", sizeof("name"), (void *) &ph, sizeof(ph), NULL); @@ -1880,6 +2619,44 @@ PHP_MINIT_FUNCTION(pq) ph.read = php_pqstm_object_read_connection; zend_hash_add(&php_pqstm_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL); + memset(&ce, 0, sizeof(ce)); + INIT_NS_CLASS_ENTRY(ce, "pq", "Transaction", php_pqtxn_methods); + php_pqtxn_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); + php_pqtxn_class_entry->create_object = php_pqtxn_create_object; + + memcpy(&php_pqtxn_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_pqtxn_object_handlers.read_property = php_pq_object_read_prop; + php_pqtxn_object_handlers.write_property = php_pq_object_write_prop; + php_pqtxn_object_handlers.clone_obj = NULL; + php_pqtxn_object_handlers.get_property_ptr_ptr = NULL; + php_pqtxn_object_handlers.get_debug_info = php_pq_object_debug_info; + + zend_hash_init(&php_pqtxn_object_prophandlers, 4, NULL, NULL, 1); + + zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqtxn_object_read_connection; + zend_hash_add(&php_pqtxn_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("isolation"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqtxn_object_read_isolation; + ph.write = php_pqtxn_object_write_isolation; + zend_hash_add(&php_pqtxn_object_prophandlers, "isolation", sizeof("isolation"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("readonly"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqtxn_object_read_readonly; + ph.write = php_pqtxn_object_write_readonly; + zend_hash_add(&php_pqtxn_object_prophandlers, "readonly", sizeof("readonly"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("deferrable"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqtxn_object_read_deferrable; + ph.write = php_pqtxn_object_write_deferrable; + zend_hash_add(&php_pqtxn_object_prophandlers, "deferrable", sizeof("deferrable"), (void *) &ph, sizeof(ph), NULL); + ph.write = NULL; + + zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("READ_COMMITTED"), PHP_PQTXN_READ_COMMITTED TSRMLS_CC); + zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("REPEATABLE READ"), PHP_PQTXN_REPEATABLE_READ TSRMLS_CC); + zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("SERIALIZABLE"), PHP_PQTXN_SERIALIZABLE TSRMLS_CC); + /* REGISTER_INI_ENTRIES(); */ @@ -1889,7 +2666,7 @@ PHP_MINIT_FUNCTION(pq) /* {{{ PHP_MSHUTDOWN_FUNCTION */ -PHP_MSHUTDOWN_FUNCTION(pq) +static PHP_MSHUTDOWN_FUNCTION(pq) { /* uncomment this line if you have INI entries UNREGISTER_INI_ENTRIES(); @@ -1900,7 +2677,7 @@ PHP_MSHUTDOWN_FUNCTION(pq) /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(pq) +static PHP_MINFO_FUNCTION(pq) { php_info_print_table_start(); php_info_print_table_header(2, "pq support", "enabled"); @@ -1912,6 +2689,29 @@ PHP_MINFO_FUNCTION(pq) } /* }}} */ +const zend_function_entry pq_functions[] = { + {0} +}; + +/* {{{ pq_module_entry + */ +zend_module_entry pq_module_entry = { + STANDARD_MODULE_HEADER, + "pq", + pq_functions, + PHP_MINIT(pq), + PHP_MSHUTDOWN(pq), + NULL,/*PHP_RINIT(pq),*/ + NULL,/*PHP_RSHUTDOWN(pq),*/ + PHP_MINFO(pq), + PHP_PQ_EXT_VERSION, + STANDARD_MODULE_PROPERTIES +}; +/* }}} */ + +#ifdef COMPILE_DL_PQ +ZEND_GET_MODULE(pq) +#endif /*