X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fphp_pq.c;h=4d6918d5792447349263e60aa3346733c5df7e6f;hb=7028ab969c1803f807f99094d7dcd88fa3da8aac;hp=c220f2e713afa7f3bb791eeb84a7b3e914088e16;hpb=53220e4b7f293ed8c1c8418efc98c57d4b205e1d;p=m6w6%2Fext-pq diff --git a/src/php_pq.c b/src/php_pq.c index c220f2e..4d6918d 100644 --- a/src/php_pq.c +++ b/src/php_pq.c @@ -30,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 */ @@ -78,10 +55,16 @@ 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_class_entry *php_pqcancel_class_entry; +static zend_class_entry *php_pqevent_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; +static zend_object_handlers php_pqcancel_object_handlers; +static zend_object_handlers php_pqevent_object_handlers; typedef struct php_pq_callback { zend_fcall_info fci; @@ -91,17 +74,20 @@ typedef struct php_pq_callback { typedef struct php_pq_object { zend_object zo; + zend_object_value zv; void *intern; HashTable *prophandler; } php_pq_object_t; typedef struct php_pqconn_object { zend_object zo; + zend_object_value zv; PGconn *conn; HashTable *prophandler; int (*poller)(PGconn *); HashTable listeners; + HashTable eventhandlers; php_pq_callback_t onevent; } php_pqconn_object_t; @@ -127,23 +113,76 @@ typedef struct php_pqres_iterator { typedef struct php_pqres_object { zend_object zo; + zend_object_value zv; PGresult *res; HashTable *prophandler; 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; + zend_object_value zv; + 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; + zend_object_value zv; + php_pqtxn_t *txn; + HashTable *prophandler; +} php_pqtxn_object_t; + +typedef struct php_pqcancel { + PGcancel *cancel; + zval *conn; +} php_pqcancel_t; + +typedef struct php_pqcancel_object { + zend_object zo; + zend_object_value zv; + php_pqcancel_t *cancel; + HashTable *prophandler; +} php_pqcancel_object_t; + +typedef struct php_pqevent { + php_pq_callback_t cb; + zval *conn; + char *type; +} php_pqevent_t; + +typedef struct php_pqevent_object { + zend_object zo; + zend_object_value zv; + php_pqevent_t *onevent; + HashTable *prophandler; +} php_pqevent_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; +static HashTable php_pqcancel_object_prophandlers; +static HashTable php_pqevent_object_prophandlers; typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC); @@ -310,6 +349,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); @@ -341,6 +393,7 @@ static void php_pqconn_object_free(void *o TSRMLS_DC) php_pq_callback_dtor(&obj->onevent); } zend_hash_destroy(&obj->listeners); + zend_hash_destroy(&obj->eventhandlers); zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(obj); } @@ -373,13 +426,53 @@ 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); + efree(obj->txn); + obj->txn = NULL; + } + zend_object_std_dtor((zend_object *) o TSRMLS_CC); + efree(obj); +} + +static void php_pqcancel_object_free(void *o TSRMLS_DC) +{ + php_pqcancel_object_t *obj = o; + + if (obj->cancel) { + PQfreeCancel(obj->cancel->cancel); + zval_ptr_dtor(&obj->cancel->conn); + efree(obj->cancel); + obj->cancel = NULL; + } + zend_object_std_dtor((zend_object *) o TSRMLS_CC); + efree(obj); +} + +static void php_pqevent_object_free(void *o TSRMLS_DC) +{ + php_pqevent_object_t *obj = o; + + if (obj->onevent) { + php_pq_callback_dtor(&obj->onevent->cb); + zval_ptr_dtor(&obj->onevent->conn); + efree(obj->onevent->type); + efree(obj->onevent); + obj->onevent = NULL; } zend_object_std_dtor((zend_object *) o TSRMLS_CC); efree(obj); @@ -387,7 +480,6 @@ static void php_pqstm_object_free(void *o TSRMLS_DC) static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGconn *conn, php_pqconn_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_pqconn_object_t *o; o = ecalloc(1, sizeof(*o)); @@ -404,16 +496,16 @@ static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGcon } zend_hash_init(&o->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0); + zend_hash_init(&o->eventhandlers, 0, NULL, ZVAL_PTR_DTOR, 0); - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqconn_object_free, NULL TSRMLS_CC); - ov.handlers = &php_pqconn_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqconn_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqconn_object_handlers; - return ov; + return o->zv; } static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresult *res, php_pqres_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_pqres_object_t *o; o = ecalloc(1, sizeof(*o)); @@ -429,15 +521,14 @@ static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresu o->res = res; } - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC); - ov.handlers = &php_pqres_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqres_object_handlers; - return ov; + return o->zv; } -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; o = ecalloc(1, sizeof(*o)); @@ -449,19 +540,83 @@ 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 (stm) { + o->stm = stm; + } + + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqstm_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqstm_object_handlers; + + return o->zv; +} + +static zend_object_value php_pqtxn_create_object_ex(zend_class_entry *ce, php_pqtxn_t *txn, php_pqtxn_object_t **ptr TSRMLS_DC) +{ + 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; + } + + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqtxn_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqtxn_object_handlers; + + return o->zv; +} + +static zend_object_value php_pqcancel_create_object_ex(zend_class_entry *ce, php_pqcancel_t *cancel, php_pqcancel_object_t **ptr TSRMLS_DC) +{ + php_pqcancel_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_pqcancel_object_prophandlers; + + if (ptr) { + *ptr = o; + } + + if (cancel) { + o->cancel = cancel; + } + + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqcancel_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqcancel_object_handlers; + + return o->zv; +} + +static zend_object_value php_pqevent_create_object_ex(zend_class_entry *ce, php_pqevent_t *onevent, php_pqevent_object_t **ptr TSRMLS_DC) +{ + php_pqevent_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_pqevent_object_prophandlers; + + if (ptr) { + *ptr = o; } - if (name) { - o->name = estrdup(name); + if (onevent) { + o->onevent = onevent; } - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqstm_object_free, NULL TSRMLS_CC); - ov.handlers = &php_pqstm_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqevent_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_pqevent_object_handlers; - return ov; + return o->zv; } static zend_object_value php_pqconn_create_object(zend_class_entry *class_type TSRMLS_DC) @@ -476,7 +631,22 @@ 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 zend_object_value php_pqcancel_create_object(zend_class_entry *class_type TSRMLS_DC) +{ + return php_pqcancel_create_object_ex(class_type, NULL, NULL TSRMLS_CC); +} + +static zend_object_value php_pqevent_create_object(zend_class_entry *class_type TSRMLS_DC) +{ + return php_pqevent_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) @@ -487,30 +657,31 @@ static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_has 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; } @@ -524,11 +695,26 @@ static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC) 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; } + +static void php_pq_object_to_zval(void *o, zval **zv TSRMLS_DC) +{ + php_pq_object_t *obj = o; + + if (!*zv) { + MAKE_STD_ZVAL(*zv); + } + + zend_objects_store_add_ref_by_handle(obj->zv.handle TSRMLS_CC); + + (*zv)->type = IS_OBJECT; + (*zv)->value.obj = obj->zv; +} + static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC) { php_pqconn_object_t *obj = o; @@ -757,14 +943,137 @@ 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 void php_pqtxn_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + + RETVAL_ZVAL(obj->txn->conn, 1, 0); +} + +static void php_pqtxn_object_read_isolation(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + + RETVAL_LONG(obj->txn->isolation); +} + +static void php_pqtxn_object_read_readonly(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + + RETVAL_LONG(obj->txn->readonly); +} + +static void php_pqtxn_object_read_deferrable(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqtxn_object_t *obj = o; + + RETVAL_LONG(obj->txn->deferrable); +} + +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 { + res = PQexec(conn_obj->conn, "SET TRANSACTION READ WRITE"); + } + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } +} + +static void php_pqtxn_object_write_deferrable(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->deferrable = zend_is_true(value))) { + res = PQexec(conn_obj->conn, "SET TRANSACTION DEFERRABLE"); + } else { + res = PQexec(conn_obj->conn, "SET TRANSACTION NOT DEFERRABLE"); + } + + if (res) { + php_pqres_success(res TSRMLS_CC); + PQclear(res); + } +} + +static void php_pqcancel_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqcancel_object_t *obj = o; + + RETVAL_ZVAL(obj->cancel->conn, 1, 0); +} + +static void php_pqevent_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqevent_object_t *obj = o; + + RETVAL_ZVAL(obj->onevent->conn, 1, 0); +} + +static void php_pqevent_object_read_type(zval *object, void *o, zval *return_value TSRMLS_DC) +{ + php_pqevent_object_t *obj = o; + + RETVAL_STRING(obj->onevent->type, 1); } static zend_class_entry *ancestor(zend_class_entry *ce) { @@ -910,6 +1219,39 @@ static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t * return data; } +static int apply_notice_event(void *p, void *a TSRMLS_DC) +{ + zval **evh = p; + zval *args = a; + zval *retval = NULL; + + zend_call_method_with_1_params(evh, Z_OBJCE_PP(evh), NULL, "trigger", &retval, args); + if (retval) { + zval_ptr_dtor(&retval); + } + + return ZEND_HASH_APPLY_KEEP; +} + +static void php_pqconn_notice_recv(void *p, const PGresult *res) +{ + php_pqconn_event_data_t *data = p; + zval **evhs; + TSRMLS_DF(data); + + if (SUCCESS == zend_hash_find(&data->obj->eventhandlers, ZEND_STRS("notice"), (void *) &evhs)) { + zval *args, *connection = NULL; + + MAKE_STD_ZVAL(args); + array_init(args); + php_pq_object_to_zval(data->obj, &connection TSRMLS_CC); + add_next_index_zval(args, connection); + add_next_index_string(args, PQresultErrorMessage(res), 1); + zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_notice_event, args TSRMLS_CC); + zval_ptr_dtor(&args); + } +} + ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1) ZEND_ARG_INFO(0, dsn) ZEND_ARG_INFO(0, async) @@ -934,8 +1276,10 @@ static PHP_METHOD(pqconn, __construct) { } else { obj->conn = PQconnectdb(dsn_str); } - + + PQsetNoticeReceiver(obj->conn, php_pqconn_notice_recv, data); 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)); } @@ -997,19 +1341,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) @@ -1037,7 +1368,6 @@ static PHP_METHOD(pqconn, listen) { 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); @@ -1185,7 +1515,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_async, 0, 0, 1) ZEND_END_ARG_INFO(); static PHP_METHOD(pqconn, execAsync) { zend_error_handling zeh; - php_pq_callback_t resolver; + php_pq_callback_t resolver = {{0}}; char *query_str; int query_len; @@ -1366,7 +1696,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params_async, 0, 0, 2) ZEND_END_ARG_INFO(); static PHP_METHOD(pqconn, execParamsAsync) { zend_error_handling zeh; - php_pq_callback_t resolver; + php_pq_callback_t resolver = {{0}}; char *query_str; int query_len; zval *zparams; @@ -1461,7 +1791,7 @@ static STATUS php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, const c } ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare, 0, 0, 2) - ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, query) ZEND_ARG_ARRAY_INFO(0, types, 1) ZEND_END_ARG_INFO(); @@ -1477,8 +1807,14 @@ static PHP_METHOD(pqconn, prepare) { if (obj->conn) { 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 { @@ -1522,7 +1858,7 @@ static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, c } ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare_async, 0, 0, 2) -ZEND_ARG_INFO(0, name) +ZEND_ARG_INFO(0, type) ZEND_ARG_INFO(0, query) ZEND_ARG_ARRAY_INFO(0, types, 1) ZEND_END_ARG_INFO(); @@ -1539,8 +1875,14 @@ static PHP_METHOD(pqconn, prepareAsync) { 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, 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 { @@ -1578,7 +1920,7 @@ static PHP_METHOD(pqconn, quote) { } ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote_name, 0, 0, 1) - ZEND_ARG_INFO(0, name) + ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO(); static PHP_METHOD(pqconn, quoteName) { char *str; @@ -1660,13 +2002,153 @@ static PHP_METHOD(pqconn, unescapeBytea) { } } -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) +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) @@ -1678,6 +2160,8 @@ static zend_function_entry php_pqconn_methods[] = { 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} }; @@ -1780,7 +2264,7 @@ 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, type) ZEND_ARG_INFO(0, query) ZEND_ARG_ARRAY_INFO(0, types, 1) ZEND_ARG_INFO(0, async) @@ -1798,20 +2282,22 @@ static PHP_METHOD(pqstm, __construct) { php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); if (conn_obj->conn) { + STATUS rv; 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); - } + rv = php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC); } 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); + 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; } } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); @@ -1831,8 +2317,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; @@ -1845,7 +2331,7 @@ static PHP_METHOD(pqstm, exec) { 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); @@ -1854,7 +2340,7 @@ static PHP_METHOD(pqstm, exec) { 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)) { @@ -1881,14 +2367,14 @@ ZEND_END_ARG_INFO(); static PHP_METHOD(pqstm, execAsync) { zend_error_handling zeh; zval *zparams = NULL; - php_pq_callback_t resolver; + php_pq_callback_t resolver = {{0}}; 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 (obj->stm) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->stm->conn TSRMLS_CC); if (conn_obj->conn) { int count; @@ -1908,8 +2394,8 @@ static PHP_METHOD(pqstm, execAsync) { 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 (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)); } @@ -1927,7 +2413,7 @@ static PHP_METHOD(pqstm, execAsync) { 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); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized"); @@ -1950,13 +2436,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)) { @@ -1988,17 +2474,332 @@ static zend_function_entry php_pqstm_methods[] = { {0} }; +ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_construct, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0) + 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} +}; + +ZEND_BEGIN_ARG_INFO_EX(ai_pqcancel_construct, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqcancel, __construct) { + zend_error_handling zeh; + zval *zconn; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry)) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); + + if (conn_obj->conn) { + PGcancel *cancel = PQgetCancel(conn_obj->conn); + + if (cancel) { + php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + obj->cancel = ecalloc(1, sizeof(*obj->cancel)); + obj->cancel->cancel = cancel; + obj->cancel->conn = zconn; + Z_ADDREF_P(obj->cancel->conn); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not acquire cancel: %s", PQerrorMessage(conn_obj->conn)); + } + } 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_pqcancel_cancel, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqcancel, cancel) { + zend_error_handling zeh; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters_none()) { + php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->cancel) { + char err[256]; + + if (!PQcancel(obj->cancel->cancel, err, sizeof(err))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not request cancellation: %s", err); + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Cancel not initialized"); + } + } + zend_restore_error_handling(&zeh TSRMLS_CC); +} + +static zend_function_entry php_pqcancel_methods[] = { + PHP_ME(pqcancel, __construct, ai_pqcancel_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(pqcancel, cancel, ai_pqcancel_cancel, ZEND_ACC_PUBLIC) + {0} +}; + +static void php_pqconn_add_eventhandler(zval *zconn, php_pqconn_object_t *conn_obj, const char *type_str, size_t type_len, zval *zevent TSRMLS_DC) +{ + zval **evhs; + + if (SUCCESS == zend_hash_find(&conn_obj->eventhandlers, type_str, type_len + 1, (void *) &evhs)) { + Z_ADDREF_P(zevent); + add_next_index_zval(*evhs, zevent); + } else { + zval *evh; + + MAKE_STD_ZVAL(evh); + array_init(evh); + Z_ADDREF_P(zevent); + add_next_index_zval(evh, zevent); + zend_hash_add(&conn_obj->eventhandlers, type_str, type_len + 1, (void *) &evh, sizeof(zval *), NULL); + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_pqevent_construct, 0, 0, 3) + ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0) + ZEND_ARG_INFO(0, type) + ZEND_ARG_INFO(0, callable) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqevent, __construct) { + zend_error_handling zeh; + zval *zconn; + char *type_str; + int type_len; + php_pq_callback_t cb; + + zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC); + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osf", &zconn, php_pqconn_class_entry, &type_str, &type_len, &cb.fci, &cb.fcc)) { + php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC); + + if (conn_obj->conn) { + php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + obj->onevent = ecalloc(1, sizeof(*obj->onevent)); + php_pq_callback_addref(&cb); + obj->onevent->cb = cb; + Z_ADDREF_P(zconn); + obj->onevent->conn = zconn; + obj->onevent->type = estrdup(type_str); + + php_pqconn_add_eventhandler(zconn, conn_obj, type_str, type_len, getThis() 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_pqevent_trigger, 0, 0, 1) + ZEND_ARG_ARRAY_INFO(0, args, 1) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqevent, trigger) { + zval *args; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &args)) { + php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + if (obj->onevent) { + zval *rv = NULL; + + if (SUCCESS == zend_fcall_info_call(&obj->onevent->cb.fci, &obj->onevent->cb.fcc, &rv, args TSRMLS_CC)) { + if (rv) { + RETVAL_ZVAL(rv, 0, 1); + } else { + RETVAL_TRUE; + } + } + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Event not initialized"); + RETVAL_FALSE; + } + } +} + +static zend_function_entry php_pqevent_methods[] = { + PHP_ME(pqevent, __construct, ai_pqevent_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(pqevent, trigger, ai_pqevent_trigger, 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_pq_object_read_prop; php_pqconn_object_handlers.write_property = php_pq_object_write_prop; @@ -2006,6 +2807,8 @@ PHP_MINIT_FUNCTION(pq) 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); @@ -2058,13 +2861,13 @@ 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_pq_object_read_prop; @@ -2073,6 +2876,8 @@ PHP_MINIT_FUNCTION(pq) 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); @@ -2114,7 +2919,6 @@ 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); @@ -2127,6 +2931,8 @@ PHP_MINIT_FUNCTION(pq) 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); @@ -2135,6 +2941,85 @@ 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); + + memset(&ce, 0, sizeof(ce)); + INIT_NS_CLASS_ENTRY(ce, "pq", "Cancel", php_pqcancel_methods); + php_pqcancel_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); + php_pqcancel_class_entry->create_object = php_pqcancel_create_object; + + memcpy(&php_pqcancel_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_pqcancel_object_handlers.read_property = php_pq_object_read_prop; + php_pqcancel_object_handlers.write_property = php_pq_object_write_prop; + php_pqcancel_object_handlers.clone_obj = NULL; + php_pqcancel_object_handlers.get_property_ptr_ptr = NULL; + php_pqcancel_object_handlers.get_debug_info = php_pq_object_debug_info; + + zend_hash_init(&php_pqcancel_object_prophandlers, 1, NULL, NULL, 1); + + zend_declare_property_null(php_pqcancel_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqcancel_object_read_connection; + zend_hash_add(&php_pqcancel_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL); + + memset(&ce, 0, sizeof(ce)); + INIT_NS_CLASS_ENTRY(ce, "pq", "Event", php_pqevent_methods); + php_pqevent_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC); + php_pqevent_class_entry->create_object = php_pqevent_create_object; + + memcpy(&php_pqevent_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_pqevent_object_handlers.read_property = php_pq_object_read_prop; + php_pqevent_object_handlers.write_property = php_pq_object_write_prop; + php_pqevent_object_handlers.clone_obj = NULL; + php_pqevent_object_handlers.get_property_ptr_ptr = NULL; + php_pqevent_object_handlers.get_debug_info = php_pq_object_debug_info; + + zend_hash_init(&php_pqevent_object_prophandlers, 2, NULL, NULL, 1); + + zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqevent_object_read_connection; + zend_hash_add(&php_pqevent_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("type"), ZEND_ACC_PUBLIC TSRMLS_CC); + ph.read = php_pqevent_object_read_type; + zend_hash_add(&php_pqevent_object_prophandlers, "type", sizeof("type"), (void *) &ph, sizeof(ph), NULL); + + zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("NOTICE"), ZEND_STRL("notice") TSRMLS_CC); /* REGISTER_INI_ENTRIES(); */ @@ -2144,7 +3029,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(); @@ -2155,7 +3040,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"); @@ -2167,6 +3052,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 /*