#include <ext/spl/spl_array.h>
#include <libpq-events.h>
+#include <fnmatch.h>
#include "php_pq.h"
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
*/
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;
void *data;
} php_pq_callback_t;
-typedef struct php_pqbase_object {
+typedef struct php_pq_object {
zend_object zo;
- void *intern;
+ zend_object_value zv;
HashTable *prophandler;
-} php_pqbase_object_t;
+ void *intern;
+} php_pq_object_t;
-typedef struct php_pqconn_object {
- zend_object zo;
+typedef struct php_pqconn {
PGconn *conn;
- HashTable *prophandler;
-
int (*poller)(PGconn *);
HashTable listeners;
+ HashTable eventhandlers;
php_pq_callback_t onevent;
- unsigned async:1;
+ unsigned unbuffered:1;
+} php_pqconn_t;
+
+typedef struct php_pqconn_object {
+ zend_object zo;
+ zend_object_value zv;
+ HashTable *prophandler;
+ php_pqconn_t *intern;
} php_pqconn_object_t;
typedef struct php_pqconn_event_data {
php_pqres_fetch_t fetch_type;
} php_pqres_iterator_t;
+typedef struct php_pqres {
+ PGresult *res;
+ php_pqres_iterator_t *iter;
+} php_pqres_t;
+
typedef struct php_pqres_object {
zend_object zo;
- PGresult *res;
+ zend_object_value zv;
HashTable *prophandler;
-
- php_pqres_iterator_t *iter;
+ php_pqres_t *intern;
} php_pqres_object_t;
+typedef struct php_pqstm {
+ php_pqconn_object_t *conn;
+ char *name;
+} php_pqstm_t;
+
typedef struct php_pqstm_object {
zend_object zo;
- char *name;
+ zend_object_value zv;
HashTable *prophandler;
-
- zval *conn;
+ php_pqstm_t *intern;
} 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 {
+ php_pqconn_object_t *conn;
+ 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;
+ HashTable *prophandler;
+ php_pqtxn_t *intern;
+} php_pqtxn_object_t;
+
+typedef struct php_pqcancel {
+ PGcancel *cancel;
+ php_pqconn_object_t *conn;
+} php_pqcancel_t;
+
+typedef struct php_pqcancel_object {
+ zend_object zo;
+ zend_object_value zv;
+ HashTable *prophandler;
+ php_pqcancel_t *intern;
+} php_pqcancel_object_t;
+
+typedef struct php_pqevent {
+ php_pq_callback_t cb;
+ php_pqconn_object_t *conn;
+ char *type;
+} php_pqevent_t;
+
+typedef struct php_pqevent_object {
+ zend_object zo;
+ zend_object_value zv;
+ HashTable *prophandler;
+ php_pqevent_t *intern;
+} 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);
php_pqres_iterator_t *iter = (php_pqres_iterator_t *) i;
php_pqres_object_t *obj = zend_object_store_get_object(iter->zi.data TSRMLS_CC);
- if (PQresultStatus(obj->res) != PGRES_TUPLES_OK) {
+ if (PQresultStatus(obj->intern->res) != PGRES_TUPLES_OK) {
return FAILURE;
}
- if (PQntuples(obj->res) <= iter->index) {
+ if (PQntuples(obj->intern->res) <= iter->index) {
return FAILURE;
}
if (iter->current_val) {
zval_ptr_dtor(&iter->current_val);
}
- iter->current_val = php_pqres_row_to_zval(obj->res, iter->index, iter->fetch_type TSRMLS_CC);
+ iter->current_val = php_pqres_row_to_zval(obj->intern->res, iter->index, iter->fetch_type TSRMLS_CC);
*data_ptr = &iter->current_val;
}
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);
}
}
+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_pq_object_addref(void *o TSRMLS_DC)
+{
+ php_pq_object_t *obj = o;
+ zend_objects_store_add_ref_by_handle(obj->zv.handle TSRMLS_CC);
+}
+
+static void php_pq_object_delref(void *o TSRMLS_DC)
+{
+ php_pq_object_t *obj = o;
+ zend_objects_store_del_ref_by_handle_ex(obj->zv.handle, obj->zv.handlers TSRMLS_CC);
+}
+
static void php_pqconn_object_free(void *o TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
- if (obj->conn) {
- PQfinish(obj->conn);
- obj->conn = NULL;
+ if (obj->intern) {
+ PQfinish(obj->intern->conn);
+ php_pq_callback_dtor(&obj->intern->onevent);
+ zend_hash_destroy(&obj->intern->listeners);
+ zend_hash_destroy(&obj->intern->eventhandlers);
+ efree(obj->intern);
+ obj->intern = NULL;
}
- if (obj->onevent.fci.size > 0) {
- php_pq_callback_dtor(&obj->onevent);
- }
- zend_hash_destroy(&obj->listeners);
zend_object_std_dtor((zend_object *) o TSRMLS_CC);
efree(obj);
}
{
php_pqres_object_t *obj = o;
- if (obj->res) {
- zval *res = PQresultInstanceData(obj->res, php_pqconn_event);
- if (res) {
- PQresultSetInstanceData(obj->res, php_pqconn_event, NULL);
- zval_ptr_dtor(&res);
- } else {
- PQclear(obj->res);
- obj->res = NULL;
+ if (obj->intern) {
+ if (obj->intern->res) {
+ zval *res = PQresultInstanceData(obj->intern->res, php_pqconn_event);
+ if (res) {
+ PQresultSetInstanceData(obj->intern->res, php_pqconn_event, NULL);
+ zval_ptr_dtor(&res);
+ } else {
+ PQclear(obj->intern->res);
+ obj->intern->res = NULL;
+ }
}
- }
- if (obj->iter) {
- php_pqres_iterator_dtor((zend_object_iterator *) obj->iter TSRMLS_CC);
- obj->iter = NULL;
+
+ if (obj->intern->iter) {
+ php_pqres_iterator_dtor((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+ obj->intern->iter = NULL;
+ }
+
+ efree(obj->intern);
+ obj->intern = NULL;
}
zend_object_std_dtor((zend_object *) o TSRMLS_CC);
efree(obj);
{
php_pqstm_object_t *obj = o;
- if (obj->name) {
- efree(obj->name);
- obj->name = NULL;
+ if (obj->intern) {
+ php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ efree(obj->intern->name);
+ efree(obj->intern);
+ obj->intern = 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->intern) {
+ php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ efree(obj->intern);
+ obj->intern = 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->intern) {
+ PQfreeCancel(obj->intern->cancel);
+ php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ efree(obj->intern);
+ obj->intern = 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_pqevent_object_free(void *o TSRMLS_DC)
+{
+ php_pqevent_object_t *obj = o;
+
+ if (obj->intern) {
+ php_pq_callback_dtor(&obj->intern->cb);
+ php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ efree(obj->intern->type);
+ efree(obj->intern);
+ obj->intern = NULL;
}
zend_object_std_dtor((zend_object *) o TSRMLS_CC);
efree(obj);
}
-static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGconn *conn, php_pqconn_object_t **ptr TSRMLS_DC)
+
+static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, php_pqconn_t *intern, php_pqconn_object_t **ptr TSRMLS_DC)
{
- zend_object_value ov;
php_pqconn_object_t *o;
o = ecalloc(1, sizeof(*o));
*ptr = o;
}
- if (conn) {
- o->conn = conn;
- o->async = !PQisnonblocking(o->conn);
+ if (intern) {
+ o->intern = intern;
}
- zend_hash_init(&o->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 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)
+static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, php_pqres_t *intern, php_pqres_object_t **ptr TSRMLS_DC)
{
- zend_object_value ov;
php_pqres_object_t *o;
o = ecalloc(1, sizeof(*o));
*ptr = o;
}
- if (res) {
- o->res = res;
+ if (intern) {
+ o->intern = intern;
}
- 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 *intern, php_pqstm_object_t **ptr TSRMLS_DC)
{
- zend_object_value ov;
php_pqstm_object_t *o;
o = ecalloc(1, sizeof(*o));
*ptr = o;
}
- if (conn) {
- Z_ADDREF_P(conn);
- o->conn = conn;
+ if (intern) {
+ o->intern = intern;
+ }
+
+ 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 *intern, 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 (intern) {
+ o->intern = intern;
+ }
+
+ 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 *intern, 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 (intern) {
+ o->intern = intern;
+ }
+
+ 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 *intern, 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 (intern) {
+ o->intern = intern;
}
- 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)
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)
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;
}
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;
}
+
static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
- RETVAL_LONG(PQstatus(obj->conn));
+ RETVAL_LONG(PQstatus(obj->intern->conn));
}
static void php_pqconn_object_read_transaction_status(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
- RETVAL_LONG(PQtransactionStatus(obj->conn));
+ RETVAL_LONG(PQtransactionStatus(obj->intern->conn));
}
static void php_pqconn_object_read_error_message(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
- char *error = PQerrorMessage(obj->conn);
+ char *error = PQerrorMessage(obj->intern->conn);
if (error) {
RETVAL_STRING(error, 1);
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;
}
-static void php_pqconn_notify_listeners(zval *this_ptr, php_pqconn_object_t *obj TSRMLS_DC)
+static void php_pqconn_notify_listeners(php_pqconn_object_t *obj TSRMLS_DC)
{
PGnotify *nfy;
- if (!obj) {
- obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- }
-
- while ((nfy = PQnotifies(obj->conn))) {
- zend_hash_apply_with_argument(&obj->listeners, apply_notify_listeners, nfy TSRMLS_CC);
+ while ((nfy = PQnotifies(obj->intern->conn))) {
+ zend_hash_apply_with_arguments(&obj->intern->listeners TSRMLS_CC, apply_notify_listeners, 1, nfy);
PQfreemem(nfy);
}
}
static void php_pqconn_object_read_types(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqconn_object_t *obj = o;
- PGresult *res = PQexec(obj->conn, PHP_PQ_TYPES_QUERY);
+ PGresult *res = PQexec(obj->intern->conn, PHP_PQ_TYPES_QUERY);
- php_pqconn_notify_listeners(object, obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
/* FIXME: cache that */
if (res) {
}
PQclear(res);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types: %s", PQerrorMessage(obj->intern->conn));
}
}
{
php_pqconn_object_t *obj = o;
- RETVAL_BOOL(PQisBusy(obj->conn));
+ RETVAL_BOOL(PQisBusy(obj->intern->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->intern->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->intern->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_pqconn_object_read_unbuffered(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+
+ RETVAL_BOOL(obj->intern->unbuffered);
+}
+
+static void php_pqconn_object_write_unbuffered(zval *object, void *o, zval *value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+
+ obj->intern->unbuffered = zend_is_true(value);
+}
+
+static void php_pqconn_object_read_db(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *db = PQdb(obj->intern->conn);
+
+ if (db) {
+ RETVAL_STRING(db, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+}
+
+static void php_pqconn_object_read_user(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *user = PQuser(obj->intern->conn);
+
+ if (user) {
+ RETVAL_STRING(user, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+}
+
+static void php_pqconn_object_read_pass(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *pass = PQpass(obj->intern->conn);
+
+ if (pass) {
+ RETVAL_STRING(pass, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+}
+
+static void php_pqconn_object_read_host(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *host = PQhost(obj->intern->conn);
+
+ if (host) {
+ RETVAL_STRING(host, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+}
+
+static void php_pqconn_object_read_port(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *port = PQport(obj->intern->conn);
+
+ if (port) {
+ RETVAL_STRING(port, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+}
+
+static void php_pqconn_object_read_options(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqconn_object_t *obj = o;
+ char *options = PQoptions(obj->intern->conn);
+
+ if (options) {
+ RETVAL_STRING(options, 1);
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
}
static void php_pqres_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqres_object_t *obj = o;
- RETVAL_LONG(PQresultStatus(obj->res));
+ RETVAL_LONG(PQresultStatus(obj->intern->res));
}
static void php_pqres_object_read_error_message(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqres_object_t *obj = o;
- char *error = PQresultErrorMessage(obj->res);
+ char *error = PQresultErrorMessage(obj->intern->res);
if (error) {
RETVAL_STRING(error, 1);
{
php_pqres_object_t *obj = o;
- RETVAL_LONG(PQntuples(obj->res));
+ RETVAL_LONG(PQntuples(obj->intern->res));
}
static void php_pqres_object_read_num_cols(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqres_object_t *obj = o;
- RETVAL_LONG(PQnfields(obj->res));
+ RETVAL_LONG(PQnfields(obj->intern->res));
}
static void php_pqres_object_read_affected_rows(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqres_object_t *obj = o;
- RETVAL_LONG(atoi(PQcmdTuples(obj->res)));
+ RETVAL_LONG(atoi(PQcmdTuples(obj->intern->res)));
}
static void php_pqres_object_read_fetch_type(zval *object, void *o, zval *return_value TSRMLS_DC)
{
php_pqres_object_t *obj = o;
- if (obj->iter) {
- RETVAL_LONG(obj->iter->fetch_type);
+ if (obj->intern->iter) {
+ RETVAL_LONG(obj->intern->iter->fetch_type);
} else {
RETVAL_LONG(PHP_PQRES_FETCH_ARRAY);
}
convert_to_long_ex(&zfetch_type);
}
- obj->iter->fetch_type = Z_LVAL_P(zfetch_type);
+ if (!obj->intern->iter) {
+ obj->intern->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC);
+ obj->intern->iter->zi.funcs->rewind((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+ }
+ obj->intern->iter->fetch_type = Z_LVAL_P(zfetch_type);
if (zfetch_type != value) {
zval_ptr_dtor(&zfetch_type);
{
php_pqstm_object_t *obj = o;
- RETVAL_STRING(obj->name, 1);
+ RETVAL_STRING(obj->intern->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);
+ php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
}
-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);
+ php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
- 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;
+
+ RETVAL_LONG(obj->intern->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->intern->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->intern->deferrable);
+}
+
+static void php_pqtxn_object_write_isolation(zval *object, void *o, zval *value TSRMLS_DC)
+{
+ php_pqtxn_object_t *obj = o;
+ php_pqtxn_isolation_t orig = obj->intern->isolation;
+ zval *zisolation = value;
+ PGresult *res;
+
+ if (Z_TYPE_P(zisolation) != IS_LONG) {
+ convert_to_long_ex(&zisolation);
}
- return return_value;
+ switch ((obj->intern->isolation = Z_LVAL_P(zisolation))) {
+ case PHP_PQTXN_READ_COMMITTED:
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ COMMITED");
+ break;
+ case PHP_PQTXN_REPEATABLE_READ:
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION REPEATABLE READ");
+ break;
+ case PHP_PQTXN_SERIALIZABLE:
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION SERIALIZABLE");
+ break;
+ default:
+ obj->intern->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_pqconn_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
+static void php_pqtxn_object_write_readonly(zval *object, void *o, zval *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;
+ PGresult *res;
- 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);
- }
+ if ((obj->intern->readonly = zend_is_true(value))) {
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ ONLY");
} else {
- zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ WRITE");
+ }
+
+ if (res) {
+ php_pqres_success(res TSRMLS_CC);
+ PQclear(res);
}
}
-static zval *php_pqres_object_read_prop(zval *object, zval *member, int type, 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;
- zval *return_value;
-
- if (!obj->res) {
- zend_error(E_WARNING, "Result not initialized");
- } else if (SUCCESS == zend_hash_find(&php_pqres_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
- if (type == BP_VAR_R) {
- ALLOC_ZVAL(return_value);
- Z_SET_REFCOUNT_P(return_value, 0);
- Z_UNSET_ISREF_P(return_value);
+ php_pqtxn_object_t *obj = o;
+ PGresult *res;
- 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;
- }
+ if ((obj->intern->deferrable = zend_is_true(value))) {
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION DEFERRABLE");
} else {
- return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+ res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION NOT DEFERRABLE");
}
- 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_pqcancel_object_read_connection(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;
+ php_pqcancel_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 (handler->write) {
- /* ensure obj->iter is initialized, for e.g. write_fetch_type */
- if (!obj->iter) {
- obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC);
- obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC);
- }
- handler->write(object, obj, value TSRMLS_CC);
- }
- } else {
- zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
+ php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+static void php_pqevent_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+ php_pqevent_object_t *obj = o;
+
+ php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+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->intern->type, 1);
+}
+
+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);
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 {
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);
}
ZVAL_STRINGL(&zmember, "socket", sizeof("socket")-1, 0);
MAKE_STD_ZVAL(zsocket);
- if ((CONNECTION_BAD != PQstatus(obj->conn))
- && (-1 < (socket = PQsocket(obj->conn)))
+ if ((CONNECTION_BAD != PQstatus(obj->intern->conn))
+ && (-1 < (socket = PQsocket(obj->intern->conn)))
&& (stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
php_stream_to_zval(stream, zsocket);
retval = SUCCESS;
{
PQsetInstanceData(event->conn, php_pqconn_event, data);
}
+
static void php_pqconn_event_conndestroy(PGEventConnDestroy *event, php_pqconn_event_data_t *data)
{
PQsetInstanceData(event->conn, php_pqconn_event, NULL);
efree(data);
}
+
+static int apply_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_event_connreset(PGEventConnReset *event, php_pqconn_event_data_t *data)
+{
+ zval **evhs;
+ TSRMLS_DF(data);
+
+ if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (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);
+ zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+ zval_ptr_dtor(&args);
+ }
+}
+
+static zval *result_instance_zval(PGresult *res TSRMLS_DC)
+{
+ zval *rid = PQresultInstanceData(res, php_pqconn_event);
+
+ if (!rid) {
+ php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+ MAKE_STD_ZVAL(rid);
+ r->res = res;
+ rid->type = IS_OBJECT;
+ rid->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+
+ PQresultSetInstanceData(res, php_pqconn_event, rid);
+ }
+
+ Z_ADDREF_P(rid);
+ return rid;
+}
+
static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data)
{
+ zval **evhs;
TSRMLS_DF(data);
- if (data->obj->onevent.fci.size > 0) {
- zval *res;
+ /* event listener */
+ if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
+ zval *args, *connection = NULL, *res = result_instance_zval(event->result TSRMLS_CC);
- MAKE_STD_ZVAL(res);
- res->type = IS_OBJECT;
- res->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, event->result, NULL TSRMLS_CC);
+ 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_zval(args, res);
+ zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+ zval_ptr_dtor(&args);
+ }
- Z_ADDREF_P(res);
- PQresultSetInstanceData(event->result, php_pqconn_event, res);
+ /* async callback */
+ if (data->obj->intern->onevent.fci.size > 0) {
+ zval *res = result_instance_zval(event->result TSRMLS_CC);
- zend_fcall_info_argn(&data->obj->onevent.fci TSRMLS_CC, 1, &res);
- zend_fcall_info_call(&data->obj->onevent.fci, &data->obj->onevent.fcc, NULL, NULL TSRMLS_CC);
+ zend_fcall_info_argn(&data->obj->intern->onevent.fci TSRMLS_CC, 1, &res);
+ zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL TSRMLS_CC);
zval_ptr_dtor(&res);
}
}
case PGEVT_CONNDESTROY:
php_pqconn_event_conndestroy(e, data);
break;
+ case PGEVT_CONNRESET:
+ php_pqconn_event_connreset(e, data);
+ break;
case PGEVT_RESULTCREATE:
php_pqconn_event_resultcreate(e, data);
break;
return data;
}
+static void php_pqconn_notice_recv(void *p, const PGresult *res)
+{
+ php_pqconn_event_data_t *data = p;
+ zval **evhs;
+ TSRMLS_DF(data);
+
+ if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("notice"), (void *) &evhs)) {
+ zval *args, *connection = NULL;
+
+ 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_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)
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, __construct) {
zend_error_handling zeh;
- char *dsn_str;
- int dsn_len;
+ char *dsn_str = "";
+ int dsn_len = 0;
zend_bool async = 0;
zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &dsn_str, &dsn_len, &async)) {
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sb", &dsn_str, &dsn_len, &async)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
php_pqconn_event_data_t *data = php_pqconn_event_data_init(obj TSRMLS_CC);
- if (obj->conn) {
- PQfinish(obj->conn);
- }
- if ((obj->async = async)) {
- obj->conn = PQconnectStart(dsn_str);
- obj->poller = (int (*)(PGconn*)) PQconnectPoll;
+ obj->intern = ecalloc(1, sizeof(*obj->intern));
+
+ zend_hash_init(&obj->intern->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0);
+ zend_hash_init(&obj->intern->eventhandlers, 0, NULL, ZVAL_PTR_DTOR, 0);
+
+
+ if (async) {
+ obj->intern->conn = PQconnectStart(dsn_str);
+ obj->intern->poller = (int (*)(PGconn*)) PQconnectPoll;
} else {
- obj->conn = PQconnectdb(dsn_str);
+ obj->intern->conn = PQconnectdb(dsn_str);
}
-
- PQregisterEventProc(obj->conn, php_pqconn_event, "ext-pq", data);
+
+ PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, data);
+ PQregisterEventProc(obj->intern->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));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed: %s", PQerrorMessage(obj->intern->conn));
}
}
zend_restore_error_handling(&zeh TSRMLS_CC);
if (SUCCESS == zend_parse_parameters_none()) {
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;
- }
+ if (obj->intern) {
+ PQreset(obj->intern->conn);
+
+ if (CONNECTION_OK == PQstatus(obj->intern->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->intern->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->intern) {
+ if (PQresetStart(obj->intern->conn)) {
+ obj->intern->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;
}
php_pq_callback_addref(listener);
- if (SUCCESS == zend_hash_find(&obj->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) {
+ if (SUCCESS == zend_hash_find(&obj->intern->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) {
zend_hash_next_index_insert(existing_listeners, (void *) listener, sizeof(*listener), NULL);
} else {
zend_hash_init(&ht, 1, NULL, (dtor_func_t) php_pq_callback_dtor, 0);
zend_hash_next_index_insert(&ht, (void *) listener, sizeof(*listener), NULL);
- zend_hash_add(&obj->listeners, channel_str, channel_len + 1, (void *) &ht, sizeof(HashTable), NULL);
- }
-}
-
-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_hash_add(&obj->intern->listeners, channel_str, channel_len + 1, (void *) &ht, sizeof(HashTable), NULL);
}
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- obj->poller = PQconsumeInput;
+ obj->intern->poller = PQconsumeInput;
- if (obj->conn) {
- PGresult *res;
- char cmd[1024];
+ if (obj->intern) {
+ char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
+
+ if (quoted_channel) {
+ PGresult *res;
+ char *cmd;
- slprintf(cmd, sizeof(cmd), "LISTEN %s", channel_str);
- res = PQexec(obj->conn, cmd);
+ spprintf(&cmd, 0, "LISTEN %s", channel_str);
+ res = PQexec(obj->intern->conn, 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;
+ 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->intern->conn));
RETVAL_FALSE;
}
- PQclear(res);
+
+ php_pqconn_notify_listeners(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->intern->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;
}
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
+ if (obj->intern) {
PGresult *res;
char *params[2] = {channel_str, message_str};
- res = PQexecParams(obj->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0);
+ res = PQexecParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0);
if (res) {
if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
}
PQclear(res);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners: %s", PQerrorMessage(obj->intern->conn));
RETVAL_FALSE;
}
- php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+ php_pqconn_notify_listeners(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;
}
}
if (SUCCESS == zend_parse_parameters_none()) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
- if (obj->poller) {
- if (obj->poller == PQconsumeInput) {
- RETVAL_LONG(obj->poller(obj->conn) * PGRES_POLLING_OK);
- php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+ if (obj->intern) {
+ if (obj->intern->poller) {
+ if (obj->intern->poller == PQconsumeInput) {
+ RETVAL_LONG(obj->intern->poller(obj->intern->conn) * PGRES_POLLING_OK);
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
return;
} else {
- RETURN_LONG(obj->poller(obj->conn));
+ RETURN_LONG(obj->intern->poller(obj->intern->conn));
}
} else {
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;
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &query_str, &query_len)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
- PGresult *res = PQexec(obj->conn, query_str);
+ if (obj->intern) {
+ PGresult *res = PQexec(obj->intern->conn, query_str);
- php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
if (res) {
if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+ php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+ r->res = res;
return_value->type = IS_OBJECT;
- return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+ return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->intern->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);
if (SUCCESS == zend_parse_parameters_none()) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
- PGresult *res = PQgetResult(obj->conn);
+ if (obj->intern) {
+ PGresult *res = PQgetResult(obj->intern->conn);
if (res) {
+ php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+ r->res = res;
return_value->type = IS_OBJECT;
- return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+ return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
} else {
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;
}
}
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;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|f", &query_str, &query_len, &resolver.fci, &resolver.fcc)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
- php_pq_callback_dtor(&obj->onevent);
+ if (obj->intern) {
+ php_pq_callback_dtor(&obj->intern->onevent);
if (resolver.fci.size > 0) {
- obj->onevent = resolver;
- php_pq_callback_addref(&obj->onevent);
+ obj->intern->onevent = resolver;
+ php_pq_callback_addref(&obj->intern->onevent);
}
- obj->poller = PQconsumeInput;
+ obj->intern->poller = PQconsumeInput;
- if (PQsendQuery(obj->conn, query_str)) {
+ if (PQsendQuery(obj->intern->conn, query_str)) {
+ if (obj->intern->unbuffered) {
+ if (!PQsetSingleRowMode(obj->intern->conn)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->intern->conn));
+ }
+ }
RETVAL_TRUE;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->intern->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;
}
}
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!", &query_str, &query_len, &zparams, &ztypes)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
+ if (obj->intern) {
PGresult *res;
int count;
Oid *types = NULL;
php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
}
- res = PQexecParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0);
+ res = PQexecParams(obj->intern->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0);
zend_hash_destroy(&zdtor);
if (types) {
efree(params);
}
- php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj TSRMLS_CC);
if (res) {
if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+ php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+ r->res = res;
return_value->type = IS_OBJECT;
- return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+ return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->intern->conn));
RETVAL_FALSE;
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
RETVAL_FALSE;
}
}
ZEND_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;
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!f", &query_str, &query_len, &zparams, &ztypes, &resolver.fci, &resolver.fcc)) {
php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- if (obj->conn) {
+ if (obj->intern) {
int count;
Oid *types = NULL;
char **params = NULL;
php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
}
- php_pq_callback_dtor(&obj->onevent);
+ php_pq_callback_dtor(&obj->intern->onevent);
if (resolver.fci.size > 0) {
- obj->onevent = resolver;
- php_pq_callback_addref(&obj->onevent);
+ obj->intern->onevent = resolver;
+ php_pq_callback_addref(&obj->intern->onevent);
}
- obj->poller = PQconsumeInput;
+ obj->intern->poller = PQconsumeInput;
- if (PQsendQueryParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
+ if (PQsendQueryParams(obj->intern->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
+ if (obj->intern->unbuffered) {
+ if (!PQsetSingleRowMode(obj->intern->conn)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->intern->conn));
+ }
+ }
RETVAL_TRUE;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->intern->conn));
RETVAL_FALSE;
}
efree(params);
}
- php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+ php_pqconn_notify_listeners(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 (!obj) {
+ obj = zend_object_store_get_object(object TSRMLS_CC);
+ }
+
if (typest) {
count = zend_hash_num_elements(typest);
php_pq_types_to_array(typest, &types TSRMLS_CC);
}
- res = PQprepare(conn, name, query, count, types);
+ res = PQprepare(obj->intern->conn, name, query, count, types);
if (types) {
efree(types);
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->intern->conn));
}
return rv;
}
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();
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) {
- if (SUCCESS == php_pqconn_prepare(obj->conn, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+ if (obj->intern) {
+ 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));
+
+ php_pq_object_addref(obj TSRMLS_CC);
+ stm->conn = obj;
+ 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);
+ php_pqconn_notify_listeners(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 STATUS php_pqconn_prepare_async(PGconn *conn, const char *name, const char *query, HashTable *typest TSRMLS_DC)
+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(conn, name, query, count, types)) {
+ if (PQsendPrepare(obj->intern->conn, name, query, count, types)) {
+ if (obj->intern->unbuffered) {
+ if (!PQsetSingleRowMode(obj->intern->conn)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->intern->conn));
+ }
+ }
rv = SUCCESS;
} else {
- 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->intern->conn));
rv = FAILURE;
}
}
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();
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(obj->conn, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+ if (obj->intern) {
+ obj->intern->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));
+
+ php_pq_object_addref(obj TSRMLS_CC);
+ stm->conn = obj;
+ 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);
+ php_pqconn_notify_listeners(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_get_result, ZEND_ACC_PUBLIC)
- PHP_ME(pqconn, execAsync, ai_pqconn_exec_async, ZEND_ACC_PUBLIC)
- PHP_ME(pqconn, execParamsAsync, ai_pqconn_exec_params_async, ZEND_ACC_PUBLIC)
- PHP_ME(pqconn, prepareAsync, ai_pqconn_prepare_async, ZEND_ACC_PUBLIC)
- {0}
-};
+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;
-static zval **php_pqres_iteration(zval *this_ptr, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type TSRMLS_DC)
-{
- zval **row = NULL;
- php_pqres_fetch_t orig_fetch;
+ 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) {
- obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- }
+ if (obj->intern) {
+ char *quoted = PQescapeLiteral(obj->intern->conn, str, len);
- if (!obj->iter) {
- obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(getThis()), getThis(), 0 TSRMLS_CC);
- obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC);
- }
- orig_fetch = obj->iter->fetch_type;
- obj->iter->fetch_type = fetch_type;
- if (SUCCESS == obj->iter->zi.funcs->valid((zend_object_iterator *) obj->iter TSRMLS_CC)) {
- obj->iter->zi.funcs->get_current_data((zend_object_iterator *) obj->iter, &row TSRMLS_CC);
- obj->iter->zi.funcs->move_forward((zend_object_iterator *) obj->iter TSRMLS_CC);
+ if (quoted) {
+ RETVAL_STRING(quoted, 1);
+ PQfreemem(quoted);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote string: %s", PQerrorMessage(obj->intern->conn));
+ RETVAL_FALSE;
+ }
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+ RETVAL_FALSE;
+ }
}
- obj->iter->fetch_type = orig_fetch;
-
- return row ? row : NULL;
}
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_row, 0, 0, 0)
- ZEND_ARG_INFO(0, fetch_type)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote_name, 0, 0, 1)
+ ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO();
-static PHP_METHOD(pqres, fetchRow) {
- zend_error_handling zeh;
- php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- long fetch_type = obj->iter ? obj->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+static PHP_METHOD(pqconn, quoteName) {
+ char *str;
+ int len;
- zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_type)) {
- zval **row = php_pqres_iteration(getThis(), obj, fetch_type TSRMLS_CC);
+ 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 (row) {
- RETVAL_ZVAL(*row, 1, 0);
+ if (obj->intern) {
+ char *quoted = PQescapeIdentifier(obj->intern->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->intern->conn));
+ RETVAL_FALSE;
+ }
} else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
RETVAL_FALSE;
}
}
- zend_restore_error_handling(&zeh TSRMLS_CC);
-}
-
-static zval **column_at(zval *row, int col TSRMLS_DC)
-{
- zval **data = NULL;
- HashTable *ht = HASH_OF(row);
- int count = zend_hash_num_elements(ht);
-
- if (col < count) {
- zend_hash_internal_pointer_reset(ht);
- while (col-- > 0) {
- zend_hash_move_forward(ht);
- }
- 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);
- }
- return data;
}
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 0)
- ZEND_ARG_INFO(0, col_num)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_escape_bytea, 0, 0, 1)
+ ZEND_ARG_INFO(0, bytea)
ZEND_END_ARG_INFO();
-static PHP_METHOD(pqres, fetchCol) {
- zend_error_handling zeh;
- long fetch_col = 0;
+static PHP_METHOD(pqconn, escapeBytea) {
+ char *str;
+ int len;
- zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
- if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_col)) {
- php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
- zval **row = php_pqres_iteration(getThis(), obj, obj->iter ? obj->iter->fetch_type : 0 TSRMLS_CC);
+ 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 (row) {
- zval **col = column_at(*row, fetch_col TSRMLS_CC);
+ if (obj->intern) {
+ size_t escaped_len;
+ char *escaped_str = (char *) PQescapeByteaConn(obj->intern->conn, (unsigned char *) str, len, &escaped_len);
- if (col) {
- RETVAL_ZVAL(*col, 1, 0);
+ 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->intern->conn));
RETVAL_FALSE;
}
} else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
RETVAL_FALSE;
}
}
- zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+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->intern) {
+ 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 unescape bytea: %s", PQerrorMessage(obj->intern->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->intern) {
+ 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->intern->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->intern->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->intern->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->intern->conn, cmd)) {
+ conn_obj->intern->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->intern->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));
+
+ php_pq_object_addref(obj TSRMLS_CC);
+ txn->conn = obj;
+ 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));
+
+ php_pq_object_addref(obj TSRMLS_CC);
+ txn->conn = obj;
+ 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_trace, 0, 0, 0)
+ ZEND_ARG_INFO(0, stdio_stream)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, trace) {
+ zval *zstream = NULL;
+
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
+ php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ if (obj->intern) {
+ if (zstream) {
+ FILE *fp;
+ php_stream *stream = NULL;
+
+ php_stream_from_zval(stream, &zstream);
+
+ if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS)) {
+ stream->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+ PQtrace(obj->intern->conn, fp);
+ RETVAL_TRUE;
+ } else {
+ RETVAL_FALSE;
+ }
+ } else {
+ PQuntrace(obj->intern->conn);
+ RETVAL_TRUE;
+ }
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+ RETVAL_FALSE;
+ }
+ }
+}
+
+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)
+ PHP_ME(pqconn, trace, ai_pqconn_trace, ZEND_ACC_PUBLIC)
+ {0}
+};
+
+static zval **php_pqres_iteration(zval *this_ptr, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type TSRMLS_DC)
+{
+ zval **row = NULL;
+ php_pqres_fetch_t orig_fetch;
+
+ if (!obj) {
+ obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ }
+
+ if (!obj->intern->iter) {
+ obj->intern->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(getThis()), getThis(), 0 TSRMLS_CC);
+ obj->intern->iter->zi.funcs->rewind((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+ }
+ orig_fetch = obj->intern->iter->fetch_type;
+ obj->intern->iter->fetch_type = fetch_type;
+ if (SUCCESS == obj->intern->iter->zi.funcs->valid((zend_object_iterator *) obj->intern->iter TSRMLS_CC)) {
+ obj->intern->iter->zi.funcs->get_current_data((zend_object_iterator *) obj->intern->iter, &row TSRMLS_CC);
+ obj->intern->iter->zi.funcs->move_forward((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+ }
+ obj->intern->iter->fetch_type = orig_fetch;
+
+ return row ? row : NULL;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_row, 0, 0, 0)
+ ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, fetchRow) {
+ zend_error_handling zeh;
+ php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ long fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+
+ zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_type)) {
+ zval **row = php_pqres_iteration(getThis(), obj, fetch_type TSRMLS_CC);
+
+ if (row) {
+ RETVAL_ZVAL(*row, 1, 0);
+ } else {
+ RETVAL_FALSE;
+ }
+ }
+ zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+static zval **column_at(zval *row, int col TSRMLS_DC)
+{
+ zval **data = NULL;
+ HashTable *ht = HASH_OF(row);
+ int count = zend_hash_num_elements(ht);
+
+ if (col < count) {
+ zend_hash_internal_pointer_reset(ht);
+ while (col-- > 0) {
+ zend_hash_move_forward(ht);
+ }
+ zend_hash_get_current_data(ht, (void *) &data);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Column index %d exceeds column count %d", col, count);
+ }
+ return data;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 0)
+ ZEND_ARG_INFO(0, col_num)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, fetchCol) {
+ zend_error_handling zeh;
+ long fetch_col = 0;
+
+ zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_col)) {
+ php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+ zval **row = php_pqres_iteration(getThis(), obj, obj->intern->iter ? obj->intern->iter->fetch_type : 0 TSRMLS_CC);
+
+ if (row) {
+ zval **col = column_at(*row, fetch_col TSRMLS_CC);
+
+ if (col) {
+ RETVAL_ZVAL(*col, 1, 0);
+ } else {
+ RETVAL_FALSE;
+ }
+ } else {
+ RETVAL_FALSE;
+ }
+ }
+ zend_restore_error_handling(&zeh TSRMLS_CC);
}
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)
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 (conn_obj->intern) {
+ STATUS rv;
if (async) {
- conn_obj->poller = PQconsumeInput;
- if (SUCCESS == php_pqconn_prepare_async(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);
- }
+ conn_obj->intern->poller = PQconsumeInput;
+ 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(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);
- }
- 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(conn_obj TSRMLS_CC);
+ }
+
+ if (SUCCESS == rv) {
+ php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
+
+ php_pq_object_addref(conn_obj TSRMLS_CC);
+ stm->conn = conn_obj;
+ stm->name = estrdup(name_str);
+ obj->intern = stm;
}
} 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);
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 (conn_obj->conn) {
+ if (obj->intern) {
+ if (obj->intern->conn->intern) {
int count = 0;
char **params = NULL;
HashTable 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(obj->intern->conn->intern->conn, obj->intern->name, count, (const char *const*) params, NULL, NULL, 0);
if (params) {
efree(params);
zend_hash_destroy(&zdtor);
}
- php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
if (res) {
if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+ php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+ r->res = res;
return_value->type = IS_OBJECT;
- return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+ return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(obj->intern->conn->intern->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);
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 (conn_obj->conn) {
+ if (obj->intern) {
+ if (obj->intern->conn->intern) {
int count;
char **params = NULL;
HashTable zdtor;
count = php_pq_params_to_array(Z_ARRVAL_P(zparams), ¶ms, &zdtor TSRMLS_CC);
}
- php_pq_callback_dtor(&conn_obj->onevent);
+ php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
if (resolver.fci.size > 0) {
- conn_obj->onevent = resolver;
- php_pq_callback_addref(&conn_obj->onevent);
+ obj->intern->conn->intern->onevent = resolver;
+ php_pq_callback_addref(&obj->intern->conn->intern->onevent);
}
- conn_obj->poller = PQconsumeInput;
+ obj->intern->conn->intern->poller = PQconsumeInput;
- if (PQsendQueryPrepared(conn_obj->conn, obj->name, count, (const char *const*) params, NULL, NULL, 0)) {
+ if (PQsendQueryPrepared(obj->intern->conn->intern->conn, obj->intern->name, count, (const char *const*) params, NULL, NULL, 0)) {
+ if (obj->intern->conn->intern->unbuffered) {
+ if (!PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->intern->conn->intern->conn));
+ }
+ }
RETVAL_TRUE;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(obj->intern->conn->intern->conn));
RETVAL_FALSE;
}
zend_hash_destroy(&zdtor);
}
- php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj->intern->conn 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;
}
} 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;
}
}
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 (conn_obj->conn) {
- PGresult *res = PQdescribePrepared(conn_obj->conn, obj->name);
+ if (obj->intern) {
+ if (obj->intern->conn->intern) {
+ PGresult *res = PQdescribePrepared(obj->intern->conn->intern->conn, obj->intern->name);
- php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+ php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
if (res) {
if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
}
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(conn_obj->conn));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(obj->intern->conn->intern->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);
{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->intern) {
+ 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) {
+ obj->intern = ecalloc(1, sizeof(*obj->intern));
+
+ php_pq_object_addref(conn_obj TSRMLS_CC);
+ obj->intern->conn = conn_obj;
+ obj->intern->isolation = isolation;
+ obj->intern->readonly = readonly;
+ obj->intern->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->intern) {
+
+ if (obj->intern->conn->intern) {
+ PGresult *res = PQexec(obj->intern->conn->intern->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(obj->intern->conn->intern->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->intern) {
+ if (obj->intern->conn->intern) {
+ obj->intern->conn->intern->poller = PQconsumeInput;
+
+ if (!PQsendQuery(obj->intern->conn->intern->conn, "COMMIT")) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not commit transaction: %s", PQerrorMessage(obj->intern->conn->intern->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->intern) {
+ if (obj->intern->conn->intern) {
+ PGresult *res = PQexec(obj->intern->conn->intern->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(obj->intern->conn->intern->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->intern) {
+ if (obj->intern->conn->intern) {
+ obj->intern->conn->intern->poller = PQconsumeInput;
+ if (!PQsendQuery(obj->intern->conn->intern->conn, "REOLLBACK")) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not rollback transaction: %s", PQerrorMessage(obj->intern->conn->intern->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->intern) {
+ PGcancel *cancel = PQgetCancel(conn_obj->intern->conn);
+
+ if (cancel) {
+ php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ obj->intern = ecalloc(1, sizeof(*obj->intern));
+ obj->intern->cancel = cancel;
+ php_pq_object_addref(conn_obj TSRMLS_CC);
+ obj->intern->conn = conn_obj;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not acquire cancel: %s", PQerrorMessage(conn_obj->intern->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->intern) {
+ char err[256];
+
+ if (!PQcancel(obj->intern->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->intern->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->intern->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->intern) {
+ php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ obj->intern = ecalloc(1, sizeof(*obj->intern));
+ php_pq_callback_addref(&cb);
+ obj->intern->cb = cb;
+ php_pq_object_addref(conn_obj TSRMLS_CC);
+ obj->intern->conn = conn_obj;
+ obj->intern->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->intern) {
+ zval *rv = NULL;
+
+ if (SUCCESS == zend_fcall_info_call(&obj->intern->cb.fci, &obj->intern->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_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, 14, 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);
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);
+ ph.read = php_pqconn_object_read_unbuffered;
+ ph.write = php_pqconn_object_write_unbuffered;
+ zend_hash_add(&php_pqconn_object_prophandlers, "unbuffered", sizeof("unbuffered"), (void *) &ph, sizeof(ph), NULL);
+ ph.write = NULL;
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("db"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_db;
+ zend_hash_add(&php_pqconn_object_prophandlers, "db", sizeof("db"), (void *) &ph, sizeof(ph), NULL);
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_user;
+ zend_hash_add(&php_pqconn_object_prophandlers, "user", sizeof("user"), (void *) &ph, sizeof(ph), NULL);
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_pass;
+ zend_hash_add(&php_pqconn_object_prophandlers, "pass", sizeof("pass"), (void *) &ph, sizeof(ph), NULL);
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_host;
+ zend_hash_add(&php_pqconn_object_prophandlers, "host", sizeof("host"), (void *) &ph, sizeof(ph), NULL);
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_port;
+ zend_hash_add(&php_pqconn_object_prophandlers, "port", sizeof("port"), (void *) &ph, sizeof(ph), NULL);
+
+ zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("options"), ZEND_ACC_PUBLIC TSRMLS_CC);
+ ph.read = php_pqconn_object_read_options;
+ zend_hash_add(&php_pqconn_object_prophandlers, "options", sizeof("options"), (void *) &ph, sizeof(ph), NULL);
+
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);
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);
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);
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);
+ zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("RESULT"), ZEND_STRL("result") TSRMLS_CC);
+ zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("RESET"), ZEND_STRL("reset") TSRMLS_CC);
+
/*
REGISTER_INI_ENTRIES();
*/
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
-PHP_MSHUTDOWN_FUNCTION(pq)
+static PHP_MSHUTDOWN_FUNCTION(pq)
{
/* uncomment this line if you have INI entries
UNREGISTER_INI_ENTRIES();
/* {{{ 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");
}
/* }}} */
+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
/*