progress++
[m6w6/ext-pq] / src / php_pq.c
index 64cd734b18eb3c8c87b4ecc2ec76310e513e332e..c220f2e713afa7f3bb791eeb84a7b3e914088e16 100644 (file)
@@ -1,31 +1,28 @@
 /*
-  +----------------------------------------------------------------------+
-  | PHP Version 5                                                        |
-  +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2012 The PHP Group                                |
-  +----------------------------------------------------------------------+
-  | This source file is subject to version 3.01 of the PHP license,      |
-  | that is bundled with this package in the file LICENSE, and is        |
-  | available through the world-wide-web at the following url:           |
-  | http://www.php.net/license/3_01.txt                                  |
-  | If you did not receive a copy of the PHP license and are unable to   |
-  | obtain it through the world-wide-web, please send a note to          |
-  | license@php.net so we can mail you a copy immediately.               |
-  +----------------------------------------------------------------------+
-  | Author:                                                              |
-  +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: pq                                                         |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2013, Michael Wallner <mike@php.net>                |
+    +--------------------------------------------------------------------+
 */
 
-/* $Id$ */
-
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
 
-#include "php.h"
-#include "ext/standard/info.h"
-#include "php_pq.h"
+#include <php.h>
+#include <Zend/zend_interfaces.h>
+#include <ext/standard/info.h>
+#include <ext/spl/spl_array.h>
+
 #include <libpq-events.h>
+#include <fnmatch.h>
+
+#include "php_pq.h"
 
 typedef int STATUS; /* SUCCESS/FAILURE */
 
@@ -80,21 +77,40 @@ static void php_pq_init_globals(zend_pq_globals *pq_globals)
 
 static zend_class_entry *php_pqconn_class_entry;
 static zend_class_entry *php_pqres_class_entry;
+static zend_class_entry *php_pqstm_class_entry;
 
 static zend_object_handlers php_pqconn_object_handlers;
 static zend_object_handlers php_pqres_object_handlers;
+static zend_object_handlers php_pqstm_object_handlers;
+
+typedef struct php_pq_callback {
+       zend_fcall_info fci;
+       zend_fcall_info_cache fcc;
+       void *data;
+} php_pq_callback_t;
+
+typedef struct php_pq_object {
+       zend_object zo;
+       void *intern;
+       HashTable *prophandler;
+} php_pq_object_t;
 
 typedef struct php_pqconn_object {
        zend_object zo;
        PGconn *conn;
+       HashTable *prophandler;
+
        int (*poller)(PGconn *);
-       unsigned blocking:1;
+       HashTable listeners;
+       php_pq_callback_t onevent;
 } php_pqconn_object_t;
 
-typedef struct php_pqres_object {
-       zend_object zo;
-       PGresult *res;
-} php_pqres_object_t;
+typedef struct php_pqconn_event_data {
+       php_pqconn_object_t *obj;
+#ifdef ZTS
+       void ***ts;
+#endif
+} php_pqconn_event_data_t;
 
 typedef enum php_pqres_fetch {
        PHP_PQRES_FETCH_ARRAY,
@@ -102,275 +118,67 @@ typedef enum php_pqres_fetch {
        PHP_PQRES_FETCH_OBJECT
 } php_pqres_fetch_t;
 
-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;
-       }
-       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
-       efree(obj);
-}
-
-static void php_pqres_object_free(void *o TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-
-       if (obj->res) {
-               PQclear(obj->res);
-               obj->res = NULL;
-       }
-       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)
-{
-       zend_object_value ov;
-       php_pqconn_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);
-
-       if (ptr) {
-               *ptr = o;
-       }
-
-       if (conn) {
-               o->conn = conn;
-               o->blocking = !PQisnonblocking(o->conn);
-       }
-
-       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqconn_object_free, NULL TSRMLS_CC);
-       ov.handlers = &php_pqconn_object_handlers;
-
-       return ov;
-}
-
-static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresult *res, php_pqres_object_t **ptr TSRMLS_DC)
-{
-       zend_object_value ov;
-       php_pqres_object_t *o;
-
-       o = ecalloc(1, sizeof(*o));
-       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
-       object_properties_init((zend_object *) o, ce);
-
-       if (ptr) {
-               *ptr = o;
-       }
-
-       if (res) {
-               o->res = res;
-       }
+typedef struct php_pqres_iterator {
+       zend_object_iterator zi;
+       zval *current_val;
+       unsigned index;
+       php_pqres_fetch_t fetch_type;
+} php_pqres_iterator_t;
 
-       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC);
-       ov.handlers = &php_pqres_object_handlers;
+typedef struct php_pqres_object {
+       zend_object zo;
+       PGresult *res;
+       HashTable *prophandler;
 
-       return ov;
-}
+       php_pqres_iterator_t *iter;
+} php_pqres_object_t;
 
-static zend_object_value php_pqconn_create_object(zend_class_entry *class_type TSRMLS_DC)
-{
-       return php_pqconn_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
-}
+typedef struct php_pqstm_object {
+       zend_object zo;
+       char *name;
+       HashTable *prophandler;
 
-static zend_object_value php_pqres_create_object(zend_class_entry *class_type TSRMLS_DC)
-{
-       return php_pqres_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
-}
+       zval *conn;
+} php_pqstm_object_t;
 
 static HashTable php_pqconn_object_prophandlers;
 static HashTable php_pqres_object_prophandlers;
+static HashTable php_pqstm_object_prophandlers;
 
-typedef void (*php_pq_object_prophandler_func_t)(void *o, zval *return_value TSRMLS_DC);
+typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC);
 
 typedef struct php_pq_object_prophandler {
        php_pq_object_prophandler_func_t read;
        php_pq_object_prophandler_func_t write;
 } php_pq_object_prophandler_t;
 
-static void php_pqconn_object_read_status(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = o;
-
-       RETVAL_LONG(PQstatus(obj->conn));
-}
-
-static void php_pqconn_object_read_transaction_status(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = o;
-
-       RETVAL_LONG(PQtransactionStatus(obj->conn));
-}
-
-static void php_pqconn_object_read_socket(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = o;
-       php_stream *stream;
-       int socket = PQsocket(obj->conn);
-
-       if ((stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
-               php_stream_to_zval(stream, return_value);
-       } else {
-               RETVAL_NULL();
-       }
-}
-
-static void php_pqconn_object_read_error_message(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = o;
-       char *error = PQerrorMessage(obj->conn);
-
-       if (error) {
-               RETVAL_STRING(error, 1);
-       } else {
-               RETVAL_NULL();
-       }
-}
-
-static void php_pqres_object_read_status(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-
-       RETVAL_LONG(PQresultStatus(obj->res));
-}
-
-static void php_pqres_object_read_error_message(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-       char *error = PQresultErrorMessage(obj->res);
-
-       if (error) {
-               RETVAL_STRING(error, 1);
-       } else {
-               RETVAL_NULL();
-       }
-}
-
-static void php_pqres_object_read_num_rows(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-
-       RETVAL_LONG(PQntuples(obj->res));
-}
-
-static void php_pqres_object_read_num_cols(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-
-       RETVAL_LONG(PQnfields(obj->res));
-}
-
-static void php_pqres_object_read_affected_rows(void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqres_object_t *obj = o;
-
-       RETVAL_LONG(atoi(PQcmdTuples(obj->res)));
-}
-
-static zval *php_pqconn_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
-       zval *return_value;
-
-       if (!obj->conn) {
-               zend_error(E_WARNING, "Connection not initialized");
-       } else if (SUCCESS == zend_hash_find(&php_pqconn_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
-               if (type == BP_VAR_R) {
-                       ALLOC_ZVAL(return_value);
-                       Z_SET_REFCOUNT_P(return_value, 0);
-                       Z_UNSET_ISREF_P(return_value);
-
-                       handler->read(obj, return_value TSRMLS_CC);
-               } else {
-                       zend_error(E_ERROR, "Cannot access pq\\Connection properties by reference or array key/index");
-                       return_value = NULL;
-               }
-       } else {
-               return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
-       }
-
-       return return_value;
-}
-
-static void php_pqconn_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
-
-       if (zend_hash_find(&php_pqconn_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
-               if (handler->write) {
-                       handler->write(obj, value TSRMLS_CC);
-               }
-       } else {
-               zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
-       }
-}
-
-static zval *php_pqres_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
-{
-       php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
-       zval *return_value;
-
-       if (!obj->res) {
-               zend_error(E_WARNING, "Result not initialized");
-       } else if (SUCCESS == zend_hash_find(&php_pqres_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
-               if (type == BP_VAR_R) {
-                       ALLOC_ZVAL(return_value);
-                       Z_SET_REFCOUNT_P(return_value, 0);
-                       Z_UNSET_ISREF_P(return_value);
-
-                       handler->read(obj, return_value TSRMLS_CC);
-               } else {
-                       zend_error(E_ERROR, "Cannot access pq\\Result properties by reference or array key/index");
-                       return_value = NULL;
-               }
-       } else {
-               return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
-       }
-
-       return return_value;
-}
-
-static void php_pqres_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
-{
-       php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
-
-       if (!obj->res) {
-               zend_error(E_WARNING, "Result not initialized");
-       } else if (zend_hash_find(&php_pqres_object_prophandlers, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
-               if (handler->write) {
-                       handler->write(obj, value TSRMLS_CC);
-               }
-       } else {
-               zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
-       }
-}
-
-typedef struct php_pqres_iterator {
-       zend_object_iterator zi;
-       zval *current_val;
-       unsigned index;
-} php_pqres_iterator_t;
-
 static zend_object_iterator_funcs php_pqres_iterator_funcs;
 
 static zend_object_iterator *php_pqres_iterator_init(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC)
 {
        php_pqres_iterator_t *iter;
+       zval *prop, *zfetch_type;
 
        iter = ecalloc(1, sizeof(*iter));
        iter->zi.funcs = &php_pqres_iterator_funcs;
        iter->zi.data = object;
        Z_ADDREF_P(object);
 
+       zfetch_type = prop = zend_read_property(ce, object, ZEND_STRL("fetchType"), 0 TSRMLS_CC);
+       if (Z_TYPE_P(zfetch_type) != IS_LONG) {
+               convert_to_long_ex(&zfetch_type);
+       }
+       iter->fetch_type = Z_LVAL_P(zfetch_type);
+       if (zfetch_type != prop) {
+               zval_ptr_dtor(&zfetch_type);
+       }
+       if (Z_REFCOUNT_P(prop)) {
+               zval_ptr_dtor(&prop);
+       } else {
+               zval_dtor(prop);
+               FREE_ZVAL(prop);
+       }
+
        return (zend_object_iterator *) iter;
 }
 
@@ -380,6 +188,7 @@ static void php_pqres_iterator_dtor(zend_object_iterator *i TSRMLS_DC)
 
        if (iter->current_val) {
                zval_ptr_dtor(&iter->current_val);
+               iter->current_val = NULL;
        }
        zval_ptr_dtor((zval **) &iter->zi.data);
        efree(iter);
@@ -400,24 +209,50 @@ static STATUS php_pqres_iterator_valid(zend_object_iterator *i TSRMLS_DC)
        return SUCCESS;
 }
 
-static zval *php_pqres_row_to_zval(PGresult *res, unsigned row)
+static zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type TSRMLS_DC)
 {
        zval *data;
        int c, cols;
 
        MAKE_STD_ZVAL(data);
-       array_init(data);
+       if (PHP_PQRES_FETCH_OBJECT == fetch_type) {
+               object_init(data);
+       } else {
+               array_init(data);
+       }
 
        for (c = 0, cols = PQnfields(res); c < cols; ++c) {
                if (PQgetisnull(res, row, c)) {
-                       add_index_null(data, c);
-                       add_assoc_null(data, PQfname(res, c));
+                       switch (fetch_type) {
+                       case PHP_PQRES_FETCH_OBJECT:
+                               add_property_null(data, PQfname(res, c));
+                               break;
+
+                       case PHP_PQRES_FETCH_ASSOC:
+                               add_assoc_null(data, PQfname(res, c));
+                               break;
+
+                       case PHP_PQRES_FETCH_ARRAY:
+                               add_index_null(data, c);
+                               break;
+                       }
                } else {
                        char *val = PQgetvalue(res, row, c);
                        int len = PQgetlength(res, row, c);
 
-                       add_index_stringl(data, c, val, len ,1);
-                       add_assoc_stringl(data, PQfname(res, c), val, len, 1);
+                       switch (fetch_type) {
+                       case PHP_PQRES_FETCH_OBJECT:
+                               add_property_stringl(data, PQfname(res, c), val, len, 1);
+                               break;
+
+                       case PHP_PQRES_FETCH_ASSOC:
+                               add_assoc_stringl(data, PQfname(res, c), val, len, 1);
+                               break;
+
+                       case PHP_PQRES_FETCH_ARRAY:
+                               add_index_stringl(data, c, val, len ,1);
+                               break;
+                       }
                }
        }
 
@@ -432,7 +267,7 @@ static void php_pqres_iterator_current(zend_object_iterator *i, zval ***data_ptr
        if (iter->current_val) {
                zval_ptr_dtor(&iter->current_val);
        }
-       iter->current_val = php_pqres_row_to_zval(obj->res, iter->index);
+       iter->current_val = php_pqres_row_to_zval(obj->res, iter->index, iter->fetch_type TSRMLS_CC);
        *data_ptr = &iter->current_val;
 }
 
@@ -475,131 +310,1681 @@ static zend_object_iterator_funcs php_pqres_iterator_funcs = {
        NULL
 };
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1)
-       ZEND_ARG_INFO(0, dsn)
-       ZEND_ARG_INFO(0, block)
-ZEND_END_ARG_INFO();
-static PHP_METHOD(pqconn, __construct) {
-       zend_error_handling zeh;
-       char *dsn_str;
-       int dsn_len;
-       zend_bool block = 1;
+static void php_pq_callback_dtor(php_pq_callback_t *cb) {
+       if (cb->fci.size > 0) {
+               zend_fcall_info_args_clear(&cb->fci, 1);
+               zval_ptr_dtor(&cb->fci.function_name);
+               if (cb->fci.object_ptr) {
+                       zval_ptr_dtor(&cb->fci.object_ptr);
+               }
+       }
+       cb->fci.size = 0;
+}
 
-       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, &block)) {
-               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+static void php_pq_callback_addref(php_pq_callback_t *cb)
+{
+       Z_ADDREF_P(cb->fci.function_name);
+       if (cb->fci.object_ptr) {
+               Z_ADDREF_P(cb->fci.object_ptr);
+       }
+}
 
-               if (obj->conn) {
+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->onevent.fci.size > 0) {
+               php_pq_callback_dtor(&obj->onevent);
+       }
+       zend_hash_destroy(&obj->listeners);
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static int php_pqconn_event(PGEventId id, void *e, void *data);
+
+static void php_pqres_object_free(void *o TSRMLS_DC)
+{
+       php_pqres_object_t *obj = o;
+
+       if (obj->res) {
+               zval *res = PQresultInstanceData(obj->res, php_pqconn_event);
+               if (res) {
+                       PQresultSetInstanceData(obj->res, php_pqconn_event, NULL);
+                       zval_ptr_dtor(&res);
+               } else {
+                       PQclear(obj->res);
+                       obj->res = NULL;
+               }
+       }
+       if (obj->iter) {
+               php_pqres_iterator_dtor((zend_object_iterator *) obj->iter TSRMLS_CC);
+               obj->iter = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqstm_object_free(void *o TSRMLS_DC)
+{
+       php_pqstm_object_t *obj = o;
+
+       if (obj->name) {
+               efree(obj->name);
+               obj->name = NULL;
+       }
+       if (obj->conn) {
+               zval_ptr_dtor(&obj->conn);
+               obj->conn = 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)
+{
+       zend_object_value ov;
+       php_pqconn_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_pqconn_object_prophandlers;
+
+       if (ptr) {
+               *ptr = o;
+       }
+
+       if (conn) {
+               o->conn = conn;
+       }
+
+       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;
+
+       return ov;
+}
+
+static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresult *res, php_pqres_object_t **ptr TSRMLS_DC)
+{
+       zend_object_value ov;
+       php_pqres_object_t *o;
+
+       o = ecalloc(1, sizeof(*o));
+       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+       object_properties_init((zend_object *) o, ce);
+       o->prophandler = &php_pqres_object_prophandlers;
+
+       if (ptr) {
+               *ptr = o;
+       }
+
+       if (res) {
+               o->res = res;
+       }
+
+       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC);
+       ov.handlers = &php_pqres_object_handlers;
+
+       return ov;
+}
+
+static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval *conn, const char *name, php_pqstm_object_t **ptr TSRMLS_DC)
+{
+       zend_object_value ov;
+       php_pqstm_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_pqstm_object_prophandlers;
+
+       if (ptr) {
+               *ptr = o;
+       }
+
+       if (conn) {
+               Z_ADDREF_P(conn);
+               o->conn = conn;
+       }
+
+       if (name) {
+               o->name = estrdup(name);
+       }
+
+       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqstm_object_free, NULL TSRMLS_CC);
+       ov.handlers = &php_pqstm_object_handlers;
+
+       return ov;
+}
+
+static zend_object_value php_pqconn_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqconn_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static zend_object_value php_pqres_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqres_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+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);
+}
+
+static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       php_pq_object_prophandler_t *ph = p;
+       HashTable *ht = va_arg(argv, HashTable *);
+       zval **return_value, *object = va_arg(argv, zval *);
+       php_pq_object_t *obj = va_arg(argv, php_pq_object_t *);
+
+       if (SUCCESS == zend_hash_find(ht, key->arKey, key->nKeyLength, (void *) &return_value)) {
+               if (ph->read) {
+                       MAKE_STD_ZVAL(*return_value);
+                       ZVAL_NULL(*return_value);
+
+                       ph->read(object, obj, *return_value TSRMLS_CC);
+               } else {
+                       zval member;
+
+                       INIT_PZVAL(&member);
+                       ZVAL_STRINGL(&member, key->arKey, key->nKeyLength-1, 0);
+                       *return_value = zend_get_std_object_handlers()->read_property(object, &member, BP_VAR_R, NULL TSRMLS_CC);
+                       Z_ADDREF_PP(return_value);
+               }
+       }
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static int apply_pi_to_debug(void *p, void *arg TSRMLS_DC)
+{
+       zend_property_info *pi = p;
+       HashTable *ht = arg;
+
+       zend_hash_add_empty_element(ht, pi->name, pi->name_length + 1);
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC)
+{
+       HashTable *ht;
+       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       *temp = 1;
+       ALLOC_HASHTABLE(ht);
+       ZEND_INIT_SYMTABLE(ht);
+
+       zend_hash_apply_with_argument(&obj->zo.ce->properties_info, apply_pi_to_debug, ht TSRMLS_CC);
+       zend_hash_apply_with_arguments(obj->prophandler TSRMLS_CC, apply_ph_to_debug, 3, ht, object, obj);
+
+       return ht;
+}
+static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_LONG(PQstatus(obj->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));
+}
+
+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);
+
+       if (error) {
+               RETVAL_STRING(error, 1);
+       } else {
+               RETVAL_NULL();
+       }
+}
+
+static int apply_notify_listener(void *p, void *arg TSRMLS_DC)
+{
+       php_pq_callback_t *listener = p;
+       PGnotify *nfy = arg;
+       zval *zpid, *zchannel, *zmessage;
+
+       MAKE_STD_ZVAL(zpid);
+       ZVAL_LONG(zpid, nfy->be_pid);
+       MAKE_STD_ZVAL(zchannel);
+       ZVAL_STRING(zchannel, nfy->relname, 1);
+       MAKE_STD_ZVAL(zmessage);
+       ZVAL_STRING(zmessage, nfy->extra, 1);
+
+       zend_fcall_info_argn(&listener->fci TSRMLS_CC, 3, &zchannel, &zmessage, &zpid);
+       zend_fcall_info_call(&listener->fci, &listener->fcc, NULL, NULL TSRMLS_CC);
+
+       zval_ptr_dtor(&zchannel);
+       zval_ptr_dtor(&zmessage);
+       zval_ptr_dtor(&zpid);
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+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 *);
+
+       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)
+{
+       PGnotify *nfy;
+
+       if (!obj) {
+               obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       }
+
+       while ((nfy = PQnotifies(obj->conn))) {
+               zend_hash_apply_with_arguments(&obj->listeners TSRMLS_CC, apply_notify_listeners, 1, nfy);
+               PQfreemem(nfy);
+       }
+}
+
+/* FIXME: extend to types->nspname->typname */
+#define PHP_PQ_TYPES_QUERY \
+       "select t.oid, t.* " \
+       "from pg_type t join pg_namespace n on t.typnamespace=n.oid " \
+       "where typisdefined " \
+       "and typrelid=0 " \
+       "and nspname in ('public', 'pg_catalog')"
+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);
+
+       php_pqconn_notify_listeners(object, obj TSRMLS_CC);
+
+       /* FIXME: cache that */
+       if (res) {
+               if (PGRES_TUPLES_OK == PQresultStatus(res)) {
+                       int r, rows;
+                       zval *byoid, *byname;
+
+                       MAKE_STD_ZVAL(byoid);
+                       MAKE_STD_ZVAL(byname);
+                       object_init(byoid);
+                       object_init(byname);
+                       object_init(return_value);
+                       for (r = 0, rows = PQntuples(res); r < rows; ++r) {
+                               zval *row = php_pqres_row_to_zval(res, r, PHP_PQRES_FETCH_OBJECT TSRMLS_CC);
+
+                               add_property_zval(byoid, PQgetvalue(res, r, 0), row);
+                               add_property_zval(byname, PQgetvalue(res, r, 1), row);
+                               zval_ptr_dtor(&row);
+                       }
+
+                       add_property_zval(return_value, "byOid", byoid);
+                       add_property_zval(return_value, "byName", byname);
+                       zval_ptr_dtor(&byoid);
+                       zval_ptr_dtor(&byname);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types: %s", PQresultErrorMessage(res));
+               }
+               PQclear(res);
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types: %s", PQerrorMessage(obj->conn));
+       }
+}
+
+static void php_pqconn_object_read_busy(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_BOOL(PQisBusy(obj->conn));
+}
+
+static void php_pqconn_object_read_encoding(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_STRING(pg_encoding_to_char(PQclientEncoding(obj->conn)), 1);
+}
+
+static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       zval *zenc = value;
+
+       if (Z_TYPE_P(value) != IS_STRING) {
+               convert_to_string_ex(&zenc);
+       }
+
+       if (0 > PQsetClientEncoding(obj->conn, Z_STRVAL_P(zenc))) {
+               zend_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
+       }
+
+       if (zenc != value) {
+               zval_ptr_dtor(&zenc);
+       }
+}
+
+static void php_pqres_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqres_object_t *obj = o;
+
+       RETVAL_LONG(PQresultStatus(obj->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);
+
+       if (error) {
+               RETVAL_STRING(error, 1);
+       } else {
+               RETVAL_NULL();
+       }
+}
+
+static void php_pqres_object_read_num_rows(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqres_object_t *obj = o;
+
+       RETVAL_LONG(PQntuples(obj->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));
+}
+
+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)));
+}
+
+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);
+       } else {
+               RETVAL_LONG(PHP_PQRES_FETCH_ARRAY);
+       }
+}
+
+static void php_pqres_object_write_fetch_type(zval *object, void *o, zval *value TSRMLS_DC)
+{
+       php_pqres_object_t *obj = o;
+       zval *zfetch_type = value;
+
+       if (Z_TYPE_P(zfetch_type) != IS_LONG) {
+               convert_to_long_ex(&zfetch_type);
+       }
+
+       if (!obj->iter) {
+               obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC);
+               obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC);
+       }
+       obj->iter->fetch_type = Z_LVAL_P(zfetch_type);
+
+       if (zfetch_type != value) {
+               zval_ptr_dtor(&zfetch_type);
+       }
+}
+
+static void php_pqstm_object_read_name(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqstm_object_t *obj = o;
+
+       RETVAL_STRING(obj->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);
+}
+
+static zend_class_entry *ancestor(zend_class_entry *ce) {
+       while (ce->parent) {
+               ce = ce->parent;
+       }
+       return ce;
+}
+
+static zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
+{
+       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+       php_pq_object_prophandler_t *handler;
+       zval *return_value;
+
+       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);
+                       Z_UNSET_ISREF_P(return_value);
+
+                       handler->read(object, obj, return_value TSRMLS_CC);
+               } else {
+                       zend_error(E_ERROR, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name);
+                       return_value = NULL;
+               }
+       } else {
+               return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+       }
+
+       return return_value;
+}
+
+static void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
+{
+       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+       php_pq_object_prophandler_t *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);
+               }
+       } else {
+               zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
+       }
+}
+
+static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj TSRMLS_DC)
+{
+       zval *zsocket, zmember;
+       php_stream *stream;
+       STATUS retval;
+       int socket;
+       
+       if (!obj) {
+               obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       }
+       
+       INIT_PZVAL(&zmember);
+       ZVAL_STRINGL(&zmember, "socket", sizeof("socket")-1, 0);
+       MAKE_STD_ZVAL(zsocket);
+       
+       if ((CONNECTION_BAD != PQstatus(obj->conn))
+       &&      (-1 < (socket = PQsocket(obj->conn)))
+       &&      (stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
+               php_stream_to_zval(stream, zsocket);
+               retval = SUCCESS;
+       } else {
+               ZVAL_NULL(zsocket);
+               retval = FAILURE;
+       }
+       zend_get_std_object_handlers()->write_property(getThis(), &zmember, zsocket, NULL TSRMLS_CC);
+       zval_ptr_dtor(&zsocket);
+       
+       return retval;
+}
+
+#ifdef ZTS
+#      define TSRMLS_DF(d) TSRMLS_D = (d)->ts
+#      define TSRMLS_CF(d) (d)->ts = TSRMLS_C
+#else
+#      define TSRMLS_DF(d)
+#      define TSRMLS_CF(d)
+#endif
+
+static void php_pqconn_event_register(PGEventRegister *event, php_pqconn_event_data_t *data)
+{
+       PQsetInstanceData(event->conn, php_pqconn_event, data);
+}
+static void php_pqconn_event_conndestroy(PGEventConnDestroy *event, php_pqconn_event_data_t *data)
+{
+       PQsetInstanceData(event->conn, php_pqconn_event, NULL);
+       efree(data);
+}
+static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data)
+{
+       TSRMLS_DF(data);
+
+       if (data->obj->onevent.fci.size > 0) {
+               zval *res;
+
+               MAKE_STD_ZVAL(res);
+               res->type = IS_OBJECT;
+               res->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, event->result, NULL TSRMLS_CC);
+
+               Z_ADDREF_P(res);
+               PQresultSetInstanceData(event->result, php_pqconn_event, res);
+
+               zend_fcall_info_argn(&data->obj->onevent.fci TSRMLS_CC, 1, &res);
+               zend_fcall_info_call(&data->obj->onevent.fci, &data->obj->onevent.fcc, NULL, NULL TSRMLS_CC);
+               zval_ptr_dtor(&res);
+       }
+}
+
+static int php_pqconn_event(PGEventId id, void *e, void *data)
+{
+       switch (id) {
+       case PGEVT_REGISTER:
+               php_pqconn_event_register(e, data);
+               break;
+       case PGEVT_CONNDESTROY:
+               php_pqconn_event_conndestroy(e, data);
+               break;
+       case PGEVT_RESULTCREATE:
+               php_pqconn_event_resultcreate(e, data);
+               break;
+       default:
+               break;
+       }
+
+       return 1;
+}
+
+static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *obj TSRMLS_DC)
+{
+       php_pqconn_event_data_t *data = emalloc(sizeof(*data));
+
+       data->obj = obj;
+       TSRMLS_CF(data);
+
+       return data;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_construct, 0, 0, 1)
+       ZEND_ARG_INFO(0, dsn)
+       ZEND_ARG_INFO(0, async)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, __construct) {
+       zend_error_handling zeh;
+       char *dsn_str;
+       int dsn_len;
+       zend_bool async = 0;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &dsn_str, &dsn_len, &async)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+               php_pqconn_event_data_t *data =  php_pqconn_event_data_init(obj TSRMLS_CC);
+
+               if (obj->conn) {
                        PQfinish(obj->conn);
                }
-               if ((obj->blocking = block)) {
-                       obj->conn = PQconnectdb(dsn_str);
+               if (async) {
+                       obj->conn = PQconnectStart(dsn_str);
+                       obj->poller = (int (*)(PGconn*)) PQconnectPoll;
+               } else {
+                       obj->conn = PQconnectdb(dsn_str);
+               }
+               
+               PQregisterEventProc(obj->conn, php_pqconn_event, "ext-pq", data);
+               if (SUCCESS != php_pqconn_update_socket(getThis(), obj TSRMLS_CC)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed: %s", PQerrorMessage(obj->conn));
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, reset) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       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));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+               RETURN_FALSE;
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, resetAsync) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       if (PQresetStart(obj->conn)) {
+                               obj->poller = (int (*)(PGconn*)) PQresetPoll;
+                               RETURN_TRUE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+               RETURN_FALSE;
+       }
+}
+
+static void php_pqconn_add_listener(php_pqconn_object_t *obj, const char *channel_str, size_t channel_len, php_pq_callback_t *listener TSRMLS_DC)
+{
+       HashTable ht, *existing_listeners;
+
+       php_pq_callback_addref(listener);
+
+       if (SUCCESS == zend_hash_find(&obj->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) {
+               zend_hash_next_index_insert(existing_listeners, (void *) listener, sizeof(*listener), NULL);
+       } else {
+               zend_hash_init(&ht, 1, NULL, (dtor_func_t) 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_BEGIN_ARG_INFO_EX(ai_pqconn_listen, 0, 0, 0)
+       ZEND_ARG_INFO(0, channel)
+       ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, listen) {
+       char *channel_str = NULL;
+       int channel_len = 0;
+       php_pq_callback_t listener;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               obj->poller = PQconsumeInput;
+
+               if (obj->conn) {
+                       char *quoted_channel = PQescapeIdentifier(obj->conn, channel_str, channel_len);
+
+                       if (quoted_channel) {
+                               PGresult *res;
+                               char *cmd;
+
+                               spprintf(&cmd, 0, "LISTEN %s", channel_str);
+                               res = PQexec(obj->conn, cmd);
+
+                               efree(cmd);
+                               PQfreemem(quoted_channel);
+
+
+                               if (res) {
+                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                               php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
+                                               RETVAL_TRUE;
+                                       } else {
+                                               RETVAL_FALSE;
+                                       }
+                                       PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener: %s", PQerrorMessage(obj->conn));
+                                       RETVAL_FALSE;
+                               }
+
+                               php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape channel identifier: %s", PQerrorMessage(obj->conn));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify, 0, 0, 2)
+       ZEND_ARG_INFO(0, channel)
+       ZEND_ARG_INFO(0, message)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, notify) {
+       char *channel_str, *message_str;
+       int channel_len, message_len;
+
+       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) {
+                       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);
+
+                       if (res) {
+                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       RETVAL_TRUE;
+                               } else {
+                                       RETVAL_FALSE;
+                               }
+                               PQclear(res);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_poll, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, poll) {
+       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);
+                                       return;
+                               } else {
+                                       RETURN_LONG(obj->poller(obj->conn));
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active");
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+               RETURN_FALSE;
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec, 0, 0, 1)
+       ZEND_ARG_INFO(0, query)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, exec) {
+       zend_error_handling zeh;
+       char *query_str;
+       int query_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &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);
+
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+
+                       if (res) {
+                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       return_value->type = IS_OBJECT;
+                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_get_result, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, getResult) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       PGresult *res = PQgetResult(obj->conn);
+
+                       if (res) {
+                               return_value->type = IS_OBJECT;
+                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                       } else {
+                               RETVAL_NULL();
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_async, 0, 0, 1)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, execAsync) {
+       zend_error_handling zeh;
+       php_pq_callback_t resolver;
+       char *query_str;
+       int query_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|f", &query_str, &query_len, &resolver.fci, &resolver.fcc)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       php_pq_callback_dtor(&obj->onevent);
+                       if (resolver.fci.size > 0) {
+                               obj->onevent = resolver;
+                               php_pq_callback_addref(&obj->onevent);
+                       }
+
+                       obj->poller = PQconsumeInput;
+
+                       if (PQsendQuery(obj->conn, query_str)) {
+                               if (zend_is_true(zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) {
+                                       if (!PQsetSingleRowMode(obj->conn)) {
+                                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn));
+                                       }
+                               }
+                               RETVAL_TRUE;
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+static int apply_to_oid(void *p, void *arg TSRMLS_DC)
+{
+       Oid **types = arg;
+       zval **ztype = p;
+
+       if (Z_TYPE_PP(ztype) != IS_LONG) {
+               convert_to_long_ex(ztype);
+       }
+
+       **types = Z_LVAL_PP(ztype);
+       ++*types;
+
+       if (*ztype != *(zval **)p) {
+               zval_ptr_dtor(ztype);
+       }
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       char ***params;
+       HashTable *zdtor;
+       zval **zparam = p;
+
+       params = (char ***) va_arg(argv, char ***);
+       zdtor = (HashTable *) va_arg(argv, HashTable *);
+
+       if (Z_TYPE_PP(zparam) == IS_NULL) {
+               **params = NULL;
+               ++*params;
+       } else {
+               if (Z_TYPE_PP(zparam) != IS_STRING) {
+                       convert_to_string_ex(zparam);
+               }
+
+               **params = Z_STRVAL_PP(zparam);
+               ++*params;
+
+               if (*zparam != *(zval **)p) {
+                       zend_hash_next_index_insert(zdtor, zparam, sizeof(zval *), NULL);
+               }
+       }
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC)
+{
+       int count = zend_hash_num_elements(ht);
+       
+       *types = NULL;
+
+       if (count) {
+               Oid *tmp;
+
+               /* +1 for when less types than params are specified */
+               *types = tmp = ecalloc(count + 1, sizeof(Oid));
+               zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC);
+       }
+       
+       return count;
+}
+
+static int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC)
+{
+       int count = zend_hash_num_elements(ht);
+       
+       *params = NULL;
+
+       if (count) {
+               char **tmp;
+
+               *params = tmp = ecalloc(count, sizeof(char *));
+               zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param, 2, &tmp, zdtor);
+       }
+       
+       return count;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params, 0, 0, 2)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_ARRAY_INFO(0, params, 0)
+       ZEND_ARG_ARRAY_INFO(0, types, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, execParams) {
+       zend_error_handling zeh;
+       char *query_str;
+       int query_len;
+       zval *zparams;
+       zval *ztypes = NULL;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!", &query_str, &query_len, &zparams, &ztypes)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       PGresult *res;
+                       int count;
+                       Oid *types = NULL;
+                       char **params = NULL;
+                       HashTable zdtor;
+
+                       ZEND_INIT_SYMTABLE(&zdtor);
+                       count = php_pq_params_to_array(Z_ARRVAL_P(zparams), &params, &zdtor TSRMLS_CC);
+
+                       if (ztypes) {
+                               php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
+                       }
+
+                       res = PQexecParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0);
+
+                       zend_hash_destroy(&zdtor);
+                       if (types) {
+                               efree(types);
+                       }
+                       if (params) {
+                               efree(params);
+                       }
+
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+
+                       if (res) {
+                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       return_value->type = IS_OBJECT;
+                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params_async, 0, 0, 2)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_ARRAY_INFO(0, params, 0)
+       ZEND_ARG_ARRAY_INFO(0, types, 1)
+       ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, execParamsAsync) {
+       zend_error_handling zeh;
+       php_pq_callback_t resolver;
+       char *query_str;
+       int query_len;
+       zval *zparams;
+       zval *ztypes = NULL;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!f", &query_str, &query_len, &zparams, &ztypes, &resolver.fci, &resolver.fcc)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       int count;
+                       Oid *types = NULL;
+                       char **params = NULL;
+                       HashTable zdtor;
+
+                       ZEND_INIT_SYMTABLE(&zdtor);
+                       count = php_pq_params_to_array(Z_ARRVAL_P(zparams), &params, &zdtor TSRMLS_CC);
+
+                       if (ztypes) {
+                               php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
+                       }
+
+                       php_pq_callback_dtor(&obj->onevent);
+                       if (resolver.fci.size > 0) {
+                               obj->onevent = resolver;
+                               php_pq_callback_addref(&obj->onevent);
+                       }
+
+                       obj->poller = PQconsumeInput;
+
+                       if (PQsendQueryParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
+                               if (zend_is_true(zend_read_property(Z_OBJCE_P(getThis()), getThis(), ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) {
+                                       if (!PQsetSingleRowMode(obj->conn)) {
+                                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn));
+                                       }
+                               }
+                               RETVAL_TRUE;
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+
+                       zend_hash_destroy(&zdtor);
+                       if (types) {
+                               efree(types);
+                       }
+                       if (params) {
+                               efree(params);
+                       }
+
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+
                } else {
-                       obj->conn = PQconnectStart(dsn_str);
-                       obj->poller = (int (*)(PGconn*)) PQconnectPoll;
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
                }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
 
-               if (CONNECTION_BAD == PQstatus(obj->conn)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed: %s", PQerrorMessage(obj->conn));
+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(obj->conn, name, query, count, types);
+
+       if (types) {
+               efree(types);
+       }
+
+       if (res) {
+               rv = php_pqres_success(res TSRMLS_CC);
+               PQclear(res);
+       } else {
+               rv = FAILURE;
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn));
+       }
+       
+       return rv;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare, 0, 0, 2)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_ARRAY_INFO(0, types, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, prepare) {
+       zend_error_handling zeh;
+       zval *ztypes = NULL;
+       char *name_str, *query_str;
+       int name_len, *query_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!", &name_str, &name_len, &query_str, &query_len, &ztypes)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       if (SUCCESS == php_pqconn_prepare(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                               return_value->type = IS_OBJECT;
+                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC);
+                       }
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
                }
        }
        zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_reset, 0, 0, 0)
+static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, const char *name, const char *query, HashTable *typest TSRMLS_DC)
+{
+       STATUS rv;
+       int count;
+       Oid *types = NULL;
+       
+       if (!obj) {
+               obj = zend_object_store_get_object(object TSRMLS_CC);
+       }
+
+       if (typest) {
+               count = php_pq_types_to_array(typest, &types TSRMLS_CC);
+       }
+       
+       if (PQsendPrepare(obj->conn, name, query, count, types)) {
+               if (zend_is_true(zend_read_property(Z_OBJCE_P(object), object, ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) {
+                       if (!PQsetSingleRowMode(obj->conn)) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(obj->conn));
+                       }
+               }
+               rv = SUCCESS;
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn));
+               rv = FAILURE;
+       }
+       
+       if (types) {
+               efree(types);
+       }
+       
+       return rv;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare_async, 0, 0, 2)
+ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_ARRAY_INFO(0, types, 1)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqconn, reset) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+static PHP_METHOD(pqconn, prepareAsync) {
+       zend_error_handling zeh;
+       zval *ztypes = NULL;
+       char *name_str, *query_str;
+       int name_len, *query_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!", &name_str, &name_len, &query_str, &query_len, &ztypes)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (obj->conn) {
-                       if (obj->blocking) {
-                               PQreset(obj->conn);
-                               RETURN_TRUE; /* probably ;) */
-                       } if (PQresetStart(obj->conn)) {
-                               obj->poller = (int (*)(PGconn*)) PQresetPoll;
-                               RETURN_TRUE;
+                       obj->poller = PQconsumeInput;
+                       if (SUCCESS == php_pqconn_prepare_async(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                               return_value->type = IS_OBJECT;
+                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC);
                        }
+                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
                }
-               RETURN_FALSE;
        }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_poll, 0, 0, 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, poll) {
-       if (SUCCESS == zend_parse_parameters_none()) {
+static PHP_METHOD(pqconn, quote) {
+       char *str;
+       int len;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (obj->conn) {
-                       if (obj->poller) {
-                               RETURN_LONG(obj->poller(obj->conn));
+                       char *quoted = PQescapeLiteral(obj->conn, str, len);
+
+                       if (quoted) {
+                               RETVAL_STRING(quoted, 1);
+                               PQfreemem(quoted);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote string: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
                        }
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
                }
-               RETURN_FALSE;
        }
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec, 0, 0, 1)
-       ZEND_ARG_INFO(0, query)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote_name, 0, 0, 1)
+       ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqconn, exec) {
-       zend_error_handling zeh;
-       char *query_str;
-       int query_len;
+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, "s", &query_str, &query_len)) {
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
                if (obj->conn) {
-                       PGresult *res = PQexec(obj->conn, query_str);
+                       char *quoted = PQescapeIdentifier(obj->conn, str, len);
 
-                       if (res) {
-                               return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                       if (quoted) {
+                               RETVAL_STRING(quoted, 1);
+                               PQfreemem(quoted);
                        } 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 quote name: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
                        }
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_escape_bytea, 0, 0, 1)
+       ZEND_ARG_INFO(0, bytea)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, escapeBytea) {
+       char *str;
+       int len;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       size_t escaped_len;
+                       char *escaped_str = (char *) PQescapeByteaConn(obj->conn, (unsigned char *) str, len, &escaped_len);
+
+                       if (escaped_str) {
+                               RETVAL_STRINGL(escaped_str, escaped_len - 1, 1);
+                               PQfreemem(escaped_str);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape bytea: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unescape_bytea, 0, 0, 1)
+       ZEND_ARG_INFO(0, bytea)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, unescapeBytea) {
+       char *str;
+       int len;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn) {
+                       size_t unescaped_len;
+                       char *unescaped_str = (char *) PQunescapeBytea((unsigned char *)str, &unescaped_len);
+
+                       if (unescaped_str) {
+                               RETVAL_STRINGL(unescaped_str, unescaped_len, 1);
+                               PQfreemem(unescaped_str);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape bytea: %s", PQerrorMessage(obj->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-static zend_function_entry pqconn_methods[] = {
+static zend_function_entry php_pqconn_methods[] = {
        PHP_ME(pqconn, __construct, ai_pqconn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
        PHP_ME(pqconn, reset, ai_pqconn_reset, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, resetAsync, ai_pqconn_reset_async, ZEND_ACC_PUBLIC)
        PHP_ME(pqconn, poll, ai_pqconn_poll, ZEND_ACC_PUBLIC)
        PHP_ME(pqconn, exec, ai_pqconn_exec, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execAsync, ai_pqconn_exec_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execParams, ai_pqconn_exec_params, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execParamsAsync, ai_pqconn_exec_params_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, prepare, ai_pqconn_prepare, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, prepareAsync, ai_pqconn_prepare_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, listen, ai_pqconn_listen, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, notify, ai_pqconn_notify, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, getResult, ai_pqconn_get_result, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, quote, ai_pqconn_quote, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, quoteName, ai_pqconn_quote_name, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, escapeBytea, ai_pqconn_escape_bytea, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, unescapeBytea, ai_pqconn_unescape_bytea, ZEND_ACC_PUBLIC)
        {0}
 };
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch, 0, 0, 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->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);
+       }
+       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_ARG_INFO(0, fetch_info)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, fetchRow) {
        zend_error_handling zeh;
-       long fetch_type = PHP_PQRES_FETCH_OBJECT;
-       zval *fetch_info = NULL;
+       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;
+
+       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->iter ? obj->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);
+
+}
+
+static zend_function_entry php_pqres_methods[] = {
+       PHP_ME(pqres, fetchRow, ai_pqres_fetch_row, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, fetchCol, ai_pqres_fetch_col, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_construct, 0, 0, 3)
+       ZEND_ARG_OBJ_INFO(0, Connection, pq\\Connection, 0)
+       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, query)
+       ZEND_ARG_ARRAY_INFO(0, types, 1)
+       ZEND_ARG_INFO(0, async)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, __construct) {
+       zend_error_handling zeh;
+       zval *zconn, *ztypes = NULL;
+       char *name_str, *query_str;
+       int name_len, *query_len;
+       zend_bool async = 0;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Oss|a/!b", &zconn, php_pqconn_class_entry, &name_str, &name_len, &query_str, &query_len, &ztypes, &async)) {
+               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+               php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+
+               if (conn_obj->conn) {
+                       if (async) {
+                               conn_obj->poller = PQconsumeInput;
+                               if (SUCCESS == php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                                       Z_ADDREF_P(zconn);
+                                       obj->conn = zconn;
+                                       obj->name = estrdup(name_str);
+                               }
+                       } else {
+                               if (SUCCESS == php_pqconn_prepare(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                                       Z_ADDREF_P(zconn);
+                                       obj->conn = zconn;
+                                       obj->name = estrdup(name_str);
+                               }
+                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_exec, 0, 0, 0)
+       ZEND_ARG_ARRAY_INFO(0, params, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, exec) {
+       zend_error_handling zeh;
+       zval *zparams = NULL;
+
+       zend_replace_error_handling(EH_THROW, NULL, &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) {
+                               int count = 0;
+                               char **params = NULL;
+                               HashTable zdtor;
+                               PGresult *res;
+
+                               if (zparams) {
+                                       ZEND_INIT_SYMTABLE(&zdtor);
+                                       count = php_pq_params_to_array(Z_ARRVAL_P(zparams), &params, &zdtor TSRMLS_CC);
+                               }
+
+                               res = PQexecPrepared(conn_obj->conn, obj->name, count, (const char *const*) params, NULL, NULL, 0);
+
+                               if (params) {
+                                       efree(params);
+                               }
+                               if (zparams) {
+                                       zend_hash_destroy(&zdtor);
+                               }
+
+                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+
+                               if (res) {
+                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                               return_value->type = IS_OBJECT;
+                                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                                       }
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_exec_async, 0, 0, 0)
+       ZEND_ARG_ARRAY_INFO(0, params, 1)
+       ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, execAsync) {
+       zend_error_handling zeh;
+       zval *zparams = NULL;
+       php_pq_callback_t resolver;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!f", &zparams, &resolver.fci, &resolver.fcc)) {
+               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->conn && obj->name) {
+                       php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->conn TSRMLS_CC);
+
+                       if (conn_obj->conn) {
+                               int count;
+                               char **params = NULL;
+                               HashTable zdtor;
+
+                               if (zparams) {
+                                       ZEND_INIT_SYMTABLE(&zdtor);
+                                       count = php_pq_params_to_array(Z_ARRVAL_P(zparams), &params, &zdtor TSRMLS_CC);
+                               }
+
+                               php_pq_callback_dtor(&conn_obj->onevent);
+                               if (resolver.fci.size > 0) {
+                                       conn_obj->onevent = resolver;
+                                       php_pq_callback_addref(&conn_obj->onevent);
+                               }
+
+                               conn_obj->poller = PQconsumeInput;
+
+                               if (PQsendQueryPrepared(conn_obj->conn, obj->name, count, (const char *const*) params, NULL, NULL, 0)) {
+                                       if (zend_is_true(zend_read_property(Z_OBJCE_P(obj->conn), obj->conn, ZEND_STRL("unbuffered"), 0 TSRMLS_CC))) {
+                                               if (!PQsetSingleRowMode(conn_obj->conn)) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode: %s", PQerrorMessage(conn_obj->conn));
+                                               }
+                                       }
+                                       RETVAL_TRUE;
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
+                                       RETVAL_FALSE;
+                               }
+
+                               if (params) {
+                                       efree(params);
+                               }
+                               if (zparams) {
+                                       zend_hash_destroy(&zdtor);
+                               }
+
+                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, desc) {
+       zend_error_handling zeh;
 
        zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lz", &fetch_type, &fetch_info)) {
+       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);
+
+                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+
+                               if (res) {
+                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                               int p, params;
+
+                                               array_init(return_value);
+                                               for (p = 0, params = PQnparams(res); p < params; ++p) {
+                                                       add_next_index_long(return_value, PQparamtype(res, p));
+                                               }
+                                       }
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(conn_obj->conn));
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
+               }
        }
        zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-static zend_function_entry pqres_methods[] = {
-       PHP_ME(pqres, fetchRow, ai_pqres_fetch, ZEND_ACC_PUBLIC)
+static zend_function_entry php_pqstm_methods[] = {
+       PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqstm, exec, ai_pqstm_exec, ZEND_ACC_PUBLIC)
+       PHP_ME(pqstm, desc, ai_pqstm_desc, ZEND_ACC_PUBLIC)
+       PHP_ME(pqstm, execAsync, ai_pqstm_exec_async, ZEND_ACC_PUBLIC)
        {0}
 };
 
@@ -611,12 +1996,15 @@ PHP_MINIT_FUNCTION(pq)
        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", pqconn_methods);
+       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_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqconn_object_read_status;
@@ -627,13 +2015,29 @@ PHP_MINIT_FUNCTION(pq)
        zend_hash_add(&php_pqconn_object_prophandlers, "transactionStatus", sizeof("transactionStatus"), (void *) &ph, sizeof(ph), NULL);
 
        zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("socket"), ZEND_ACC_PUBLIC TSRMLS_CC);
-       ph.read = php_pqconn_object_read_socket;
+       ph.read = NULL; /* forward to std prophandler */
        zend_hash_add(&php_pqconn_object_prophandlers, "socket", sizeof("socket"), (void *) &ph, sizeof(ph), NULL);
 
        zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("errorMessage"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqconn_object_read_error_message;
        zend_hash_add(&php_pqconn_object_prophandlers, "errorMessage", sizeof("errorMessage"), (void *) &ph, sizeof(ph), NULL);
 
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("types"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_types;
+       zend_hash_add(&php_pqconn_object_prophandlers, "types", sizeof("types"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("busy"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_busy;
+       zend_hash_add(&php_pqconn_object_prophandlers, "busy", sizeof("busy"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("encoding"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_encoding;
+       ph.write = php_pqconn_object_write_encoding;
+       zend_hash_add(&php_pqconn_object_prophandlers, "encoding", sizeof("encoding"), (void *) &ph, sizeof(ph), NULL);
+       ph.write = NULL;
+
+       zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("unbuffered"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
+
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("STARTED"), CONNECTION_STARTED TSRMLS_CC);
@@ -656,15 +2060,18 @@ PHP_MINIT_FUNCTION(pq)
 
        zend_hash_init(&php_pqres_object_prophandlers, 1, NULL, NULL, 1);
        memset(&ce, 0, sizeof(ce));
-       INIT_NS_CLASS_ENTRY(ce, "pq", "Result", pqres_methods);
+       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;
 
        memcpy(&php_pqres_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-       php_pqres_object_handlers.read_property = php_pqres_object_read_prop;
-       php_pqres_object_handlers.write_property = php_pqres_object_write_prop;
+       php_pqres_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqres_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqres_object_handlers.clone_obj = NULL;
+       php_pqres_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqres_object_handlers.get_debug_info = php_pq_object_debug_info;
 
        zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqres_object_read_status;
@@ -686,6 +2093,12 @@ PHP_MINIT_FUNCTION(pq)
        ph.read = php_pqres_object_read_affected_rows;
        zend_hash_add(&php_pqres_object_prophandlers, "affectedRows", sizeof("affectedRows"), (void *) &ph, sizeof(ph), NULL);
 
+       zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("fetchType"), PHP_PQRES_FETCH_ARRAY, ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqres_object_read_fetch_type;
+       ph.write = php_pqres_object_write_fetch_type;
+       zend_hash_add(&php_pqres_object_prophandlers, "fetchType", sizeof("fetchType"), (void *) &ph, sizeof(ph), NULL);
+       ph.write = NULL;
+
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("EMPTY_QUERY"), PGRES_EMPTY_QUERY TSRMLS_CC);
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("COMMAND_OK"), PGRES_COMMAND_OK TSRMLS_CC);
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("TUPLES_OK"), PGRES_TUPLES_OK TSRMLS_CC);
@@ -697,6 +2110,31 @@ PHP_MINIT_FUNCTION(pq)
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("COPY_BOTH"), PGRES_COPY_BOTH TSRMLS_CC);
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("SINGLE_TUPLE"), PGRES_SINGLE_TUPLE TSRMLS_CC);
 
+       zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_ARRAY"), PHP_PQRES_FETCH_ARRAY TSRMLS_CC);
+       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_pq_object_read_prop;
+       php_pqstm_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqstm_object_handlers.clone_obj = NULL;
+       php_pqstm_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqstm_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqstm_object_read_name;
+       zend_hash_add(&php_pqstm_object_prophandlers, "name", sizeof("name"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqstm_object_read_connection;
+       zend_hash_add(&php_pqstm_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
        /*
        REGISTER_INI_ENTRIES();
        */