remove unused code
[m6w6/ext-pq] / src / php_pq.c
index c220f2e713afa7f3bb791eeb84a7b3e914088e16..bae80fcf245f4215cfaf0be8f59a620926d33265 100644 (file)
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2013, Michael Wallner <mike@php.net>                |
+    | Copyright (c) 2013, Michael Wallner <mike@php.net>                 |
     +--------------------------------------------------------------------+
 */
 
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/info.h>
 #include <ext/spl/spl_array.h>
+#include <ext/raphf/php_raphf.h>
 
 #include <libpq-events.h>
+#include <libpq/libpq-fs.h>
 #include <fnmatch.h>
 
 #include "php_pq.h"
 
 typedef int STATUS; /* SUCCESS/FAILURE */
 
+static char *rtrim(char *e) {
+       size_t l = strlen(e);
+
+       while (l-- > 0 && e[l] == '\n') {
+               e[l] = '\0';
+       }
+       return e;
+}
+
+#define PHP_PQerrorMessage(c) rtrim(PQerrorMessage((c)))
+#define PHP_PQresultErrorMessage(r) rtrim(PQresultErrorMessage((r)))
+
+static int php_pqconn_event(PGEventId id, void *e, void *data);
+
+#define PHP_PQclear(_r) \
+       do { \
+               zval *_resinszv = PQresultInstanceData((_r), php_pqconn_event); \
+               if (!_resinszv) PQclear((_r)); \
+       } while (0)
+
 /*
 ZEND_DECLARE_MODULE_GLOBALS(pq)
 */
 
-const zend_function_entry pq_functions[] = {
-       {0}
-};
-
-/* {{{ pq_module_entry
- */
-zend_module_entry pq_module_entry = {
-       STANDARD_MODULE_HEADER,
-       "pq",
-       pq_functions,
-       PHP_MINIT(pq),
-       PHP_MSHUTDOWN(pq),
-       NULL,/*PHP_RINIT(pq),*/
-       NULL,/*PHP_RSHUTDOWN(pq),*/
-       PHP_MINFO(pq),
-       PHP_PQ_EXT_VERSION,
-       STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#ifdef COMPILE_DL_PQ
-ZEND_GET_MODULE(pq)
-#endif
 
 /* {{{ PHP_INI
  */
@@ -76,12 +75,24 @@ static void php_pq_init_globals(zend_pq_globals *pq_globals)
 /* }}} */
 
 static zend_class_entry *php_pqconn_class_entry;
+static zend_class_entry *php_pqtypes_class_entry;
 static zend_class_entry *php_pqres_class_entry;
 static zend_class_entry *php_pqstm_class_entry;
+static zend_class_entry *php_pqtxn_class_entry;
+static zend_class_entry *php_pqcancel_class_entry;
+static zend_class_entry *php_pqevent_class_entry;
+static zend_class_entry *php_pqlob_class_entry;
+static zend_class_entry *php_pqcopy_class_entry;
 
 static zend_object_handlers php_pqconn_object_handlers;
+static zend_object_handlers php_pqtypes_object_handlers;
 static zend_object_handlers php_pqres_object_handlers;
 static zend_object_handlers php_pqstm_object_handlers;
+static zend_object_handlers php_pqtxn_object_handlers;
+static zend_object_handlers php_pqcancel_object_handlers;
+static zend_object_handlers php_pqevent_object_handlers;
+static zend_object_handlers php_pqlob_object_handlers;
+static zend_object_handlers php_pqcopy_object_handlers;
 
 typedef struct php_pq_callback {
        zend_fcall_info fci;
@@ -91,20 +102,43 @@ typedef struct php_pq_callback {
 
 typedef struct php_pq_object {
        zend_object zo;
-       void *intern;
+       zend_object_value zv;
        HashTable *prophandler;
+       void *intern;
 } php_pq_object_t;
 
-typedef struct php_pqconn_object {
-       zend_object zo;
-       PGconn *conn;
-       HashTable *prophandler;
+#define PHP_PQCONN_ASYNC 0x01
+#define PHP_PQCONN_PERSISTENT 0x02
 
+typedef struct php_pqconn {
+       PGconn *conn;
        int (*poller)(PGconn *);
+       php_resource_factory_t factory;
        HashTable listeners;
+       HashTable eventhandlers;
        php_pq_callback_t onevent;
+       unsigned unbuffered:1;
+} php_pqconn_t;
+
+typedef struct php_pqconn_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqconn_t *intern;
 } php_pqconn_object_t;
 
+typedef struct php_pqtypes {
+       HashTable types;
+       php_pqconn_object_t *conn;
+} php_pqtypes_t;
+
+typedef struct php_pqtypes_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqtypes_t *intern;
+} php_pqtypes_object_t;
+
 typedef struct php_pqconn_event_data {
        php_pqconn_object_t *obj;
 #ifdef ZTS
@@ -125,25 +159,125 @@ typedef struct php_pqres_iterator {
        php_pqres_fetch_t fetch_type;
 } php_pqres_iterator_t;
 
+typedef struct php_pqres {
+       PGresult *res;
+       php_pqres_iterator_t *iter;
+       HashTable bound;
+} php_pqres_t;
+
 typedef struct php_pqres_object {
        zend_object zo;
-       PGresult *res;
+       zend_object_value zv;
        HashTable *prophandler;
-
-       php_pqres_iterator_t *iter;
+       php_pqres_t *intern;
 } php_pqres_object_t;
 
+typedef struct php_pqstm {
+       php_pqconn_object_t *conn;
+       char *name;
+       HashTable bound;
+} php_pqstm_t;
+
 typedef struct php_pqstm_object {
        zend_object zo;
-       char *name;
+       zend_object_value zv;
        HashTable *prophandler;
-
-       zval *conn;
+       php_pqstm_t *intern;
 } php_pqstm_object_t;
 
+typedef enum php_pqtxn_isolation {
+       PHP_PQTXN_READ_COMMITTED,
+       PHP_PQTXN_REPEATABLE_READ,
+       PHP_PQTXN_SERIALIZABLE,
+} php_pqtxn_isolation_t;
+
+typedef struct php_pqtxn {
+       php_pqconn_object_t *conn;
+       php_pqtxn_isolation_t isolation;
+       unsigned savepoint;
+       unsigned readonly:1;
+       unsigned deferrable:1;
+} php_pqtxn_t;
+
+typedef struct php_pqtxn_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqtxn_t *intern;
+} php_pqtxn_object_t;
+
+typedef struct php_pqcancel {
+       PGcancel *cancel;
+       php_pqconn_object_t *conn;
+} php_pqcancel_t;
+
+typedef struct php_pqcancel_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqcancel_t *intern;
+} php_pqcancel_object_t;
+
+typedef struct php_pqevent {
+       php_pq_callback_t cb;
+       php_pqconn_object_t *conn;
+       char *type;
+} php_pqevent_t;
+
+typedef struct php_pqevent_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqevent_t *intern;
+} php_pqevent_object_t;
+
+typedef struct php_pqlob {
+       int lofd;
+       Oid loid;
+       php_pqtxn_object_t *txn;
+} php_pqlob_t;
+
+typedef struct php_pqlob_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqlob_t *intern;
+} php_pqlob_object_t;
+
+typedef enum php_pqcopy_direction {
+       PHP_PQCOPY_FROM_STDIN,
+       PHP_PQCOPY_TO_STDOUT
+} php_pqcopy_direction_t;
+
+typedef enum php_pqcopy_status {
+       PHP_PQCOPY_FAIL,
+       PHP_PQCOPY_CONT,
+       PHP_PQCOPY_DONE
+} php_pqcopy_status_t;
+
+typedef struct php_pqcopy {
+       php_pqcopy_direction_t direction;
+       char *expression;
+       char *options;
+       php_pqconn_object_t *conn;
+} php_pqcopy_t;
+
+typedef struct php_pqcopy_object {
+       zend_object zo;
+       zend_object_value zv;
+       HashTable *prophandler;
+       php_pqcopy_t *intern;
+} php_pqcopy_object_t;
+
 static HashTable php_pqconn_object_prophandlers;
+static HashTable php_pqtypes_object_prophandlers;
 static HashTable php_pqres_object_prophandlers;
 static HashTable php_pqstm_object_prophandlers;
+static HashTable php_pqtxn_object_prophandlers;
+static HashTable php_pqcancel_object_prophandlers;
+static HashTable php_pqevent_object_prophandlers;
+static HashTable php_pqlob_object_prophandlers;
+static HashTable php_pqcopy_object_prophandlers;
 
 typedef void (*php_pq_object_prophandler_func_t)(zval *object, void *o, zval *return_value TSRMLS_DC);
 
@@ -199,26 +333,34 @@ static STATUS php_pqres_iterator_valid(zend_object_iterator *i TSRMLS_DC)
        php_pqres_iterator_t *iter = (php_pqres_iterator_t *) i;
        php_pqres_object_t *obj = zend_object_store_get_object(iter->zi.data TSRMLS_CC);
 
-       if (PQresultStatus(obj->res) != PGRES_TUPLES_OK) {
+       if (PQresultStatus(obj->intern->res) != PGRES_TUPLES_OK) {
                return FAILURE;
        }
-       if (PQntuples(obj->res) <= iter->index) {
+       if (PQntuples(obj->intern->res) <= iter->index) {
                return FAILURE;
        }
 
        return SUCCESS;
 }
 
-static zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type TSRMLS_DC)
+static zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr TSRMLS_DC)
 {
-       zval *data;
+       zval *data = NULL;
        int c, cols;
 
-       MAKE_STD_ZVAL(data);
-       if (PHP_PQRES_FETCH_OBJECT == fetch_type) {
-               object_init(data);
-       } else {
-               array_init(data);
+       if (data_ptr) {
+               data = *data_ptr;
+       }
+       if (!data) {
+               MAKE_STD_ZVAL(data);
+               if (PHP_PQRES_FETCH_OBJECT == fetch_type) {
+                       object_init(data);
+               } else {
+                       array_init(data);
+               }
+               if (data_ptr) {
+                       *data_ptr = data;
+               }
        }
 
        for (c = 0, cols = PQnfields(res); c < cols; ++c) {
@@ -267,7 +409,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->fetch_type TSRMLS_CC);
+       iter->current_val = php_pqres_row_to_zval(obj->intern->res, iter->index, iter->fetch_type, NULL TSRMLS_CC);
        *data_ptr = &iter->current_val;
 }
 
@@ -310,6 +452,31 @@ static zend_object_iterator_funcs php_pqres_iterator_funcs = {
        NULL
 };
 
+static int php_pqres_count_elements(zval *object, long *count TSRMLS_DC)
+{
+       php_pqres_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       if (obj->intern) {
+               *count = (long) PQntuples(obj->intern->res);
+               return SUCCESS;
+       } else {
+               return FAILURE;
+       }
+}
+
+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", PHP_PQresultErrorMessage(res));
+               return FAILURE;
+       default:
+               return SUCCESS;
+       }
+}
+
 static void php_pq_callback_dtor(php_pq_callback_t *cb) {
        if (cb->fci.size > 0) {
                zend_fcall_info_args_clear(&cb->fci, 1);
@@ -329,41 +496,97 @@ static void php_pq_callback_addref(php_pq_callback_t *cb)
        }
 }
 
+static void php_pq_object_to_zval(void *o, zval **zv TSRMLS_DC)
+{
+       php_pq_object_t *obj = o;
+
+       if (!*zv) {
+               MAKE_STD_ZVAL(*zv);
+       }
+
+       zend_objects_store_add_ref_by_handle(obj->zv.handle TSRMLS_CC);
+
+       (*zv)->type = IS_OBJECT;
+       (*zv)->value.obj = obj->zv;
+}
+
+static void php_pq_object_addref(void *o TSRMLS_DC)
+{
+       php_pq_object_t *obj = o;
+       zend_objects_store_add_ref_by_handle(obj->zv.handle TSRMLS_CC);
+}
+
+static void php_pq_object_delref(void *o TSRMLS_DC)
+{
+       php_pq_object_t *obj = o;
+       zend_objects_store_del_ref_by_handle_ex(obj->zv.handle, obj->zv.handlers TSRMLS_CC);
+}
+
 static void php_pqconn_object_free(void *o TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
 
-       if (obj->conn) {
-               PQfinish(obj->conn);
-               obj->conn = NULL;
-       }
-       if (obj->onevent.fci.size > 0) {
-               php_pq_callback_dtor(&obj->onevent);
+       if (obj->intern) {
+               php_pqconn_event_data_t *evdata = PQinstanceData(obj->intern->conn, php_pqconn_event);
+
+               if (evdata) {
+                       efree(evdata);
+                       PQsetInstanceData(obj->intern->conn, php_pqconn_event, NULL);
+               }
+
+               php_resource_factory_handle_dtor(&obj->intern->factory, obj->intern->conn TSRMLS_CC);
+               php_resource_factory_dtor(&obj->intern->factory);
+               php_pq_callback_dtor(&obj->intern->onevent);
+               zend_hash_destroy(&obj->intern->listeners);
+               zend_hash_destroy(&obj->intern->eventhandlers);
+               efree(obj->intern);
+               obj->intern = NULL;
        }
-       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_pqtypes_object_free(void *o TSRMLS_DC)
+{
+       php_pqtypes_object_t *obj = o;
+
+       if (obj->intern) {
+               zend_hash_destroy(&obj->intern->types);
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern);
+               obj->intern = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
 
 static void php_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->intern) {
+               if (obj->intern->res) {
+                       zval *res = PQresultInstanceData(obj->intern->res, php_pqconn_event);
+                       if (res) {
+                               if (1 == Z_REFCOUNT_P(res)) {
+                                       PQresultSetInstanceData(obj->intern->res, php_pqconn_event, NULL);
+                               }
+                               zval_ptr_dtor(&res);
+                       } else {
+                               PQclear(obj->intern->res);
+                               obj->intern->res = NULL;
+                       }
                }
-       }
-       if (obj->iter) {
-               php_pqres_iterator_dtor((zend_object_iterator *) obj->iter TSRMLS_CC);
-               obj->iter = NULL;
+
+               if (obj->intern->iter) {
+                       php_pqres_iterator_dtor((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+                       obj->intern->iter = NULL;
+               }
+
+               zend_hash_destroy(&obj->intern->bound);
+
+               efree(obj->intern);
+               obj->intern = NULL;
        }
        zend_object_std_dtor((zend_object *) o TSRMLS_CC);
        efree(obj);
@@ -373,21 +596,92 @@ 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->intern) {
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern->name);
+               zend_hash_destroy(&obj->intern->bound);
+               efree(obj->intern);
+               obj->intern = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqtxn_object_free(void *o TSRMLS_DC)
+{
+       php_pqtxn_object_t *obj = o;
+
+       if (obj->intern) {
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern);
+               obj->intern = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqcancel_object_free(void *o TSRMLS_DC)
+{
+       php_pqcancel_object_t *obj = o;
+
+       if (obj->intern) {
+               PQfreeCancel(obj->intern->cancel);
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern);
+               obj->intern = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqevent_object_free(void *o TSRMLS_DC)
+{
+       php_pqevent_object_t *obj = o;
+
+       if (obj->intern) {
+               php_pq_callback_dtor(&obj->intern->cb);
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern->type);
+               efree(obj->intern);
+               obj->intern = NULL;
+       }
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqlob_object_free(void *o TSRMLS_DC)
+{
+       php_pqlob_object_t *obj = o;
+
+       if (obj->intern) {
+               if (obj->intern->lofd) {
+                       lo_close(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd);
+               }
+               php_pq_object_delref(obj->intern->txn TSRMLS_CC);
+               efree(obj->intern);
+               obj->intern = NULL;
        }
-       if (obj->conn) {
-               zval_ptr_dtor(&obj->conn);
-               obj->conn = NULL;
+       zend_object_std_dtor((zend_object *) o TSRMLS_CC);
+       efree(obj);
+}
+
+static void php_pqcopy_object_free(void *o TSRMLS_DC)
+{
+       php_pqcopy_object_t *obj = o;
+
+       if (obj->intern) {
+               efree(obj->intern->expression);
+               efree(obj->intern->options);
+               php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+               efree(obj->intern);
+               obj->intern = NULL;
        }
        zend_object_std_dtor((zend_object *) o TSRMLS_CC);
        efree(obj);
 }
 
-static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGconn *conn, php_pqconn_object_t **ptr TSRMLS_DC)
+static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, php_pqconn_t *intern, php_pqconn_object_t **ptr TSRMLS_DC)
 {
-       zend_object_value ov;
        php_pqconn_object_t *o;
 
        o = ecalloc(1, sizeof(*o));
@@ -399,21 +693,41 @@ static zend_object_value php_pqconn_create_object_ex(zend_class_entry *ce, PGcon
                *ptr = o;
        }
 
-       if (conn) {
-               o->conn = conn;
+       if (intern) {
+               o->intern = intern;
+       }
+
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqconn_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqconn_object_handlers;
+
+       return o->zv;
+}
+
+static zend_object_value php_pqtypes_create_object_ex(zend_class_entry *ce, php_pqtypes_t *intern, php_pqtypes_object_t **ptr TSRMLS_DC)
+{
+       php_pqtypes_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_pqtypes_object_prophandlers;
+
+       if (ptr) {
+               *ptr = o;
        }
 
-       zend_hash_init(&o->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0);
+       if (intern) {
+               o->intern = intern;
+       }
 
-       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqconn_object_free, NULL TSRMLS_CC);
-       ov.handlers = &php_pqconn_object_handlers;
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqtypes_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqtypes_object_handlers;
 
-       return ov;
+       return o->zv;
 }
 
-static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresult *res, php_pqres_object_t **ptr TSRMLS_DC)
+static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, php_pqres_t *intern, php_pqres_object_t **ptr TSRMLS_DC)
 {
-       zend_object_value ov;
        php_pqres_object_t *o;
 
        o = ecalloc(1, sizeof(*o));
@@ -425,19 +739,18 @@ static zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, PGresu
                *ptr = o;
        }
 
-       if (res) {
-               o->res = res;
+       if (intern) {
+               o->intern = intern;
        }
 
-       ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC);
-       ov.handlers = &php_pqres_object_handlers;
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqres_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqres_object_handlers;
 
-       return ov;
+       return o->zv;
 }
 
-static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval *conn, const char *name, php_pqstm_object_t **ptr TSRMLS_DC)
+static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, php_pqstm_t *intern, php_pqstm_object_t **ptr TSRMLS_DC)
 {
-       zend_object_value ov;
        php_pqstm_object_t *o;
 
        o = ecalloc(1, sizeof(*o));
@@ -449,104 +762,246 @@ static zend_object_value php_pqstm_create_object_ex(zend_class_entry *ce, zval *
                *ptr = o;
        }
 
-       if (conn) {
-               Z_ADDREF_P(conn);
-               o->conn = conn;
+       if (intern) {
+               o->intern = intern;
        }
 
-       if (name) {
-               o->name = estrdup(name);
-       }
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqstm_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqstm_object_handlers;
 
-       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;
+       return o->zv;
 }
 
-static zend_object_value php_pqconn_create_object(zend_class_entry *class_type TSRMLS_DC)
+static zend_object_value php_pqtxn_create_object_ex(zend_class_entry *ce, php_pqtxn_t *intern, php_pqtxn_object_t **ptr TSRMLS_DC)
 {
-       return php_pqconn_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
-}
+       php_pqtxn_object_t *o;
 
-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);
-}
+       o = ecalloc(1, sizeof(*o));
+       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+       object_properties_init((zend_object *) o, ce);
+       o->prophandler = &php_pqtxn_object_prophandlers;
 
-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);
+       if (ptr) {
+               *ptr = o;
+       }
+
+       if (intern) {
+               o->intern = intern;
+       }
+
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqtxn_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqtxn_object_handlers;
+
+       return o->zv;
 }
 
-static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+static zend_object_value php_pqcancel_create_object_ex(zend_class_entry *ce, php_pqcancel_t *intern, php_pqcancel_object_t **ptr TSRMLS_DC)
 {
-       php_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 *);
+       php_pqcancel_object_t *o;
 
-       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);
+       o = ecalloc(1, sizeof(*o));
+       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+       object_properties_init((zend_object *) o, ce);
+       o->prophandler = &php_pqcancel_object_prophandlers;
 
-                       ph->read(object, obj, *return_value TSRMLS_CC);
-               } else {
-                       zval member;
+       if (ptr) {
+               *ptr = o;
+       }
 
-                       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);
-               }
+       if (intern) {
+               o->intern = intern;
        }
 
-       return ZEND_HASH_APPLY_KEEP;
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqcancel_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqcancel_object_handlers;
+
+       return o->zv;
 }
 
-static int apply_pi_to_debug(void *p, void *arg TSRMLS_DC)
+static zend_object_value php_pqevent_create_object_ex(zend_class_entry *ce, php_pqevent_t *intern, php_pqevent_object_t **ptr TSRMLS_DC)
 {
-       zend_property_info *pi = p;
-       HashTable *ht = arg;
+       php_pqevent_object_t *o;
+
+       o = ecalloc(1, sizeof(*o));
+       zend_object_std_init((zend_object *) o, ce TSRMLS_CC);
+       object_properties_init((zend_object *) o, ce);
+       o->prophandler = &php_pqevent_object_prophandlers;
 
-       zend_hash_add_empty_element(ht, pi->name, pi->name_length + 1);
+       if (ptr) {
+               *ptr = o;
+       }
 
-       return ZEND_HASH_APPLY_KEEP;
+       if (intern) {
+               o->intern = intern;
+       }
+
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqevent_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqevent_object_handlers;
+
+       return o->zv;
 }
 
-static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC)
+static zend_object_value php_pqlob_create_object_ex(zend_class_entry *ce, php_pqlob_t *intern, php_pqlob_object_t **ptr TSRMLS_DC)
 {
-       HashTable *ht;
-       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+       php_pqlob_object_t *o;
 
-       *temp = 1;
-       ALLOC_HASHTABLE(ht);
-       ZEND_INIT_SYMTABLE(ht);
+       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_pqlob_object_prophandlers;
 
-       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);
+       if (ptr) {
+               *ptr = o;
+       }
 
-       return ht;
-}
-static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
-{
-       php_pqconn_object_t *obj = o;
+       if (intern) {
+               o->intern = intern;
+       }
+
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqlob_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqlob_object_handlers;
 
-       RETVAL_LONG(PQstatus(obj->conn));
+       return o->zv;
 }
 
-static void php_pqconn_object_read_transaction_status(zval *object, void *o, zval *return_value TSRMLS_DC)
+static zend_object_value php_pqcopy_create_object_ex(zend_class_entry *ce, php_pqcopy_t *intern, php_pqcopy_object_t **ptr TSRMLS_DC)
 {
-       php_pqconn_object_t *obj = o;
+       php_pqcopy_object_t *o;
 
-       RETVAL_LONG(PQtransactionStatus(obj->conn));
+       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_pqcopy_object_prophandlers;
+
+       if (ptr) {
+               *ptr = o;
+       }
+
+       if (intern) {
+               o->intern = intern;
+       }
+
+       o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_pqcopy_object_free, NULL TSRMLS_CC);
+       o->zv.handlers = &php_pqcopy_object_handlers;
+
+       return o->zv;
+}
+
+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_pqtypes_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqtypes_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 TSRMLS_CC);
+}
+
+static zend_object_value php_pqtxn_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqtxn_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static zend_object_value php_pqcancel_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqcancel_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static zend_object_value php_pqevent_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqevent_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static zend_object_value php_pqlob_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqlob_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static zend_object_value php_pqcopy_create_object(zend_class_entry *class_type TSRMLS_DC)
+{
+       return php_pqcopy_create_object_ex(class_type, NULL, NULL TSRMLS_CC);
+}
+
+static int apply_ph_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       php_pq_object_prophandler_t *ph = p;
+       HashTable *ht = va_arg(argv, HashTable *);
+       zval **return_value, *object = va_arg(argv, zval *);
+       php_pq_object_t *obj = va_arg(argv, php_pq_object_t *);
+
+       if (SUCCESS == zend_hash_find(ht, key->arKey, key->nKeyLength, (void *) &return_value)) {
+
+               if (ph->read) {
+                       zval_ptr_dtor(return_value);
+                       MAKE_STD_ZVAL(*return_value);
+                       ZVAL_NULL(*return_value);
+
+                       ph->read(object, obj, *return_value TSRMLS_CC);
+               }
+       }
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static int apply_pi_to_debug(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       zend_property_info *pi = p;
+       HashTable *ht = va_arg(argv, HashTable *);
+       zval *object = va_arg(argv, zval *);
+       php_pq_object_t *obj = va_arg(argv, php_pq_object_t *);
+       zval *property = zend_read_property(obj->zo.ce, object, pi->name, pi->name_length, 0 TSRMLS_CC);
+
+       if (1||!Z_REFCOUNT_P(property)) {
+               Z_ADDREF_P(property);
+       }
+       zend_hash_add(ht, pi->name, pi->name_length + 1, (void *) &property, sizeof(zval *), NULL);
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static HashTable *php_pq_object_debug_info(zval *object, int *temp TSRMLS_DC)
+{
+       HashTable *ht;
+       php_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_arguments(&obj->zo.ce->properties_info TSRMLS_CC, apply_pi_to_debug, 3, ht, object, obj);
+       zend_hash_apply_with_arguments(obj->prophandler TSRMLS_CC, apply_ph_to_debug, 3, ht, object, obj);
+
+       return ht;
+}
+
+static void php_pqconn_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_LONG(PQstatus(obj->intern->conn));
+}
+
+static void php_pqconn_object_read_transaction_status(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_LONG(PQtransactionStatus(obj->intern->conn));
 }
 
 static void php_pqconn_object_read_error_message(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
-       char *error = PQerrorMessage(obj->conn);
+       char *error = PHP_PQerrorMessage(obj->intern->conn);
 
        if (error) {
                RETVAL_STRING(error, 1);
@@ -590,78 +1045,28 @@ static int apply_notify_listeners(void *p TSRMLS_DC, int argc, va_list argv, zen
        return ZEND_HASH_APPLY_KEEP;
 }
 
-static void php_pqconn_notify_listeners(zval *this_ptr, php_pqconn_object_t *obj TSRMLS_DC)
+static void php_pqconn_notify_listeners(php_pqconn_object_t *obj TSRMLS_DC)
 {
        PGnotify *nfy;
 
-       if (!obj) {
-               obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-       }
-
-       while ((nfy = PQnotifies(obj->conn))) {
-               zend_hash_apply_with_arguments(&obj->listeners TSRMLS_CC, apply_notify_listeners, 1, nfy);
+       while ((nfy = PQnotifies(obj->intern->conn))) {
+               zend_hash_apply_with_arguments(&obj->intern->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));
+       RETVAL_BOOL(PQisBusy(obj->intern->conn));
 }
 
 static void php_pqconn_object_read_encoding(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqconn_object_t *obj = o;
 
-       RETVAL_STRING(pg_encoding_to_char(PQclientEncoding(obj->conn)), 1);
+       RETVAL_STRING(pg_encoding_to_char(PQclientEncoding(obj->intern->conn)), 1);
 }
 
 static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value TSRMLS_DC)
@@ -673,7 +1078,7 @@ static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
                convert_to_string_ex(&zenc);
        }
 
-       if (0 > PQsetClientEncoding(obj->conn, Z_STRVAL_P(zenc))) {
+       if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
                zend_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
        }
 
@@ -682,17 +1087,202 @@ static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
        }
 }
 
+static void php_pqconn_object_read_unbuffered(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       RETVAL_BOOL(obj->intern->unbuffered);
+}
+
+static void php_pqconn_object_write_unbuffered(zval *object, void *o, zval *value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+
+       obj->intern->unbuffered = zend_is_true(value);
+}
+
+static void php_pqconn_object_read_db(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *db = PQdb(obj->intern->conn);
+
+       if (db) {
+               RETVAL_STRING(db, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqconn_object_read_user(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *user = PQuser(obj->intern->conn);
+
+       if (user) {
+               RETVAL_STRING(user, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqconn_object_read_pass(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *pass = PQpass(obj->intern->conn);
+
+       if (pass) {
+               RETVAL_STRING(pass, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqconn_object_read_host(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *host = PQhost(obj->intern->conn);
+
+       if (host) {
+               RETVAL_STRING(host, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqconn_object_read_port(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *port = PQport(obj->intern->conn);
+
+       if (port) {
+               RETVAL_STRING(port, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqconn_object_read_options(zval *objec, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqconn_object_t *obj = o;
+       char *options = PQoptions(obj->intern->conn);
+
+       if (options) {
+               RETVAL_STRING(options, 1);
+       } else {
+               RETVAL_EMPTY_STRING();
+       }
+}
+
+static void php_pqtypes_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqtypes_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+static int has_dimension(HashTable *ht, zval *member, char **key_str, int *key_len, long *index TSRMLS_DC)
+{
+       long lval = 0;
+       zval *tmp = member;
+
+       switch (Z_TYPE_P(member)) {
+       default:
+               convert_to_string_ex(&tmp);
+               /* no break */
+       case IS_STRING:
+               if (!is_numeric_string(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp), &lval, NULL, 0)) {
+                       if (member != tmp) {
+                               zval_ptr_dtor(&tmp);
+                       }
+                       if (key_str) {
+                               *key_str = estrndup(Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
+                               if (key_len) {
+                                       *key_len = Z_STRLEN_P(tmp) + 1;
+                               }
+                       }
+                       return zend_hash_exists(ht, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp) + 1);
+               }
+               /* no break */
+       case IS_LONG:
+               lval = Z_LVAL_P(member);
+               break;
+       }
+
+       if (member != tmp) {
+               zval_ptr_dtor(&tmp);
+       }
+       if (index) {
+               *index = lval;
+       }
+       return zend_hash_index_exists(ht, lval);
+}
+
+static int php_pqtypes_object_has_dimension(zval *object, zval *member, int check_empty TSRMLS_DC)
+{
+       php_pqtypes_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+       char *key_str = NULL;
+       int key_len = 0;
+       long index = 0;
+
+       if (check_empty) {
+               if (has_dimension(&obj->intern->types, member, &key_str, &key_len, &index TSRMLS_CC)) {
+                       zval **data;
+
+                       if (key_str && key_len) {
+                               if (SUCCESS == zend_hash_find(&obj->intern->types, key_str, key_len, (void *) &data)) {
+                                       efree(key_str);
+                                       return Z_TYPE_PP(data) != IS_NULL;
+                               }
+                               efree(key_str);
+                       } else {
+                               if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) data)) {
+                                       return Z_TYPE_PP(data) != IS_NULL;
+                               }
+                       }
+               }
+       } else {
+               return has_dimension(&obj->intern->types, member, NULL, NULL, NULL TSRMLS_CC);
+       }
+
+       return 0;
+}
+
+static zval *php_pqtypes_object_read_dimension(zval *object, zval *member, int type TSRMLS_DC)
+{
+       long index = 0;
+       char *key_str = NULL;
+       int key_len = 0;
+       php_pqtypes_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
+
+       if (has_dimension(&obj->intern->types, member, &key_str, &key_len, &index TSRMLS_CC)) {
+               zval **data;
+
+               if (key_str && key_len) {
+                       if (SUCCESS == zend_hash_find(&obj->intern->types, key_str, key_len, (void *) &data)) {
+                               efree(key_str);
+                               return *data;
+                       }
+               } else {
+                       if (SUCCESS == zend_hash_index_find(&obj->intern->types, index, (void *) &data)) {
+                               return *data;
+                       }
+               }
+       }
+
+       return NULL;
+}
+
 static void php_pqres_object_read_status(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
 
-       RETVAL_LONG(PQresultStatus(obj->res));
+       RETVAL_LONG(PQresultStatus(obj->intern->res));
 }
 
 static void php_pqres_object_read_error_message(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
-       char *error = PQresultErrorMessage(obj->res);
+       char *error = PHP_PQresultErrorMessage(obj->intern->res);
 
        if (error) {
                RETVAL_STRING(error, 1);
@@ -705,29 +1295,29 @@ static void php_pqres_object_read_num_rows(zval *object, void *o, zval *return_v
 {
        php_pqres_object_t *obj = o;
 
-       RETVAL_LONG(PQntuples(obj->res));
+       RETVAL_LONG(PQntuples(obj->intern->res));
 }
 
 static void php_pqres_object_read_num_cols(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
 
-       RETVAL_LONG(PQnfields(obj->res));
+       RETVAL_LONG(PQnfields(obj->intern->res));
 }
 
 static void php_pqres_object_read_affected_rows(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
 
-       RETVAL_LONG(atoi(PQcmdTuples(obj->res)));
+       RETVAL_LONG(atoi(PQcmdTuples(obj->intern->res)));
 }
 
 static void php_pqres_object_read_fetch_type(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqres_object_t *obj = o;
 
-       if (obj->iter) {
-               RETVAL_LONG(obj->iter->fetch_type);
+       if (obj->intern->iter) {
+               RETVAL_LONG(obj->intern->iter->fetch_type);
        } else {
                RETVAL_LONG(PHP_PQRES_FETCH_ARRAY);
        }
@@ -742,11 +1332,11 @@ static void php_pqres_object_write_fetch_type(zval *object, void *o, zval *value
                convert_to_long_ex(&zfetch_type);
        }
 
-       if (!obj->iter) {
-               obj->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC);
-               obj->iter->zi.funcs->rewind((zend_object_iterator *) obj->iter TSRMLS_CC);
+       if (!obj->intern->iter) {
+               obj->intern->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(object), object, 0 TSRMLS_CC);
+               obj->intern->iter->zi.funcs->rewind((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
        }
-       obj->iter->fetch_type = Z_LVAL_P(zfetch_type);
+       obj->intern->iter->fetch_type = Z_LVAL_P(zfetch_type);
 
        if (zfetch_type != value) {
                zval_ptr_dtor(&zfetch_type);
@@ -757,71 +1347,233 @@ static void php_pqstm_object_read_name(zval *object, void *o, zval *return_value
 {
        php_pqstm_object_t *obj = o;
 
-       RETVAL_STRING(obj->name, 1);
+       RETVAL_STRING(obj->intern->name, 1);
 }
 
 static void php_pqstm_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
        php_pqstm_object_t *obj = o;
 
-       RETVAL_ZVAL(obj->conn, 1, 0);
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
-static zend_class_entry *ancestor(zend_class_entry *ce) {
-       while (ce->parent) {
-               ce = ce->parent;
-       }
-       return ce;
+static void php_pqtxn_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqtxn_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
-static zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
+static void php_pqtxn_object_read_isolation(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
-       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
-       zval *return_value;
+       php_pqtxn_object_t *obj = o;
 
-       if (!obj->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);
+       RETVAL_LONG(obj->intern->isolation);
+}
 
-                       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);
-       }
+static void php_pqtxn_object_read_readonly(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqtxn_object_t *obj = o;
 
-       return return_value;
+       RETVAL_LONG(obj->intern->readonly);
 }
 
-static void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
+static void php_pqtxn_object_read_deferrable(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
-       php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
-       php_pq_object_prophandler_t *handler;
+       php_pqtxn_object_t *obj = o;
 
-       if (SUCCESS == zend_hash_find(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);
-       }
+       RETVAL_LONG(obj->intern->deferrable);
 }
 
-static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj TSRMLS_DC)
+static void php_pqtxn_object_write_isolation(zval *object, void *o, zval *value TSRMLS_DC)
 {
-       zval *zsocket, zmember;
-       php_stream *stream;
-       STATUS retval;
-       int socket;
-       
-       if (!obj) {
+       php_pqtxn_object_t *obj = o;
+       php_pqtxn_isolation_t orig = obj->intern->isolation;
+       zval *zisolation = value;
+       PGresult *res;
+
+       if (Z_TYPE_P(zisolation) != IS_LONG) {
+               convert_to_long_ex(&zisolation);
+       }
+
+       switch ((obj->intern->isolation = Z_LVAL_P(zisolation))) {
+       case PHP_PQTXN_READ_COMMITTED:
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ COMMITED");
+               break;
+       case PHP_PQTXN_REPEATABLE_READ:
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION REPEATABLE READ");
+               break;
+       case PHP_PQTXN_SERIALIZABLE:
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION SERIALIZABLE");
+               break;
+       default:
+               obj->intern->isolation = orig;
+               res = NULL;
+               break;
+       }
+
+       if (zisolation != value) {
+               zval_ptr_dtor(&zisolation);
+       }
+
+       if (res) {
+               php_pqres_success(res TSRMLS_CC);
+               PHP_PQclear(res);
+       }
+}
+
+static void php_pqtxn_object_write_readonly(zval *object, void *o, zval *value TSRMLS_DC)
+{
+       php_pqtxn_object_t *obj = o;
+       PGresult *res;
+
+       if ((obj->intern->readonly = zend_is_true(value))) {
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ ONLY");
+       } else {
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION READ WRITE");
+       }
+
+       if (res) {
+               php_pqres_success(res TSRMLS_CC);
+               PHP_PQclear(res);
+       }
+}
+
+static void php_pqtxn_object_write_deferrable(zval *object, void *o, zval *value TSRMLS_DC)
+{
+       php_pqtxn_object_t *obj = o;
+       PGresult *res;
+
+       if ((obj->intern->deferrable = zend_is_true(value))) {
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION DEFERRABLE");
+       } else {
+               res = PQexec(obj->intern->conn->intern->conn, "SET TRANSACTION NOT DEFERRABLE");
+       }
+
+       if (res) {
+               php_pqres_success(res TSRMLS_CC);
+               PHP_PQclear(res);
+       }
+}
+
+static void php_pqcancel_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqcancel_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+static void php_pqevent_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqevent_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+static void php_pqevent_object_read_type(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqevent_object_t *obj = o;
+
+       RETVAL_STRING(obj->intern->type, 1);
+}
+
+static void php_pqlob_object_read_transaction(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqlob_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->txn, &return_value TSRMLS_CC);
+}
+
+static void php_pqlob_object_read_oid(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqlob_object_t *obj = o;
+
+       RETVAL_LONG(obj->intern->loid);
+}
+
+static void php_pqcopy_object_read_connection(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqcopy_object_t *obj = o;
+
+       php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
+}
+
+static void php_pqcopy_object_read_direction(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqcopy_object_t *obj = o;
+
+       RETVAL_LONG(obj->intern->direction);
+}
+
+static void php_pqcopy_object_read_expression(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqcopy_object_t *obj = o;
+
+       RETURN_STRING(obj->intern->expression, 1);
+}
+
+static void php_pqcopy_object_read_options(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqcopy_object_t *obj = o;
+
+       RETURN_STRING(obj->intern->options, 1);
+}
+
+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);
        }
        
@@ -829,8 +1581,8 @@ static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj
        ZVAL_STRINGL(&zmember, "socket", sizeof("socket")-1, 0);
        MAKE_STD_ZVAL(zsocket);
        
-       if ((CONNECTION_BAD != PQstatus(obj->conn))
-       &&      (-1 < (socket = PQsocket(obj->conn)))
+       if ((CONNECTION_BAD != PQstatus(obj->intern->conn))
+       &&      (-1 < (socket = PQsocket(obj->intern->conn)))
        &&      (stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
                php_stream_to_zval(stream, zsocket);
                retval = SUCCESS;
@@ -852,31 +1604,81 @@ static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj
 #      define TSRMLS_CF(d)
 #endif
 
-static void php_pqconn_event_register(PGEventRegister *event, php_pqconn_event_data_t *data)
+static int apply_event(void *p, void *a TSRMLS_DC)
 {
-       PQsetInstanceData(event->conn, php_pqconn_event, data);
+       zval **evh = p;
+       zval *args = a;
+       zval *retval = NULL;
+
+       zend_call_method_with_1_params(evh, Z_OBJCE_PP(evh), NULL, "trigger", &retval, args);
+       if (retval) {
+               zval_ptr_dtor(&retval);
+       }
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static void php_pqconn_event_connreset(PGEventConnReset *event, php_pqconn_event_data_t *data)
+{
+       zval **evhs;
+       TSRMLS_DF(data);
+
+       if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (void *) &evhs)) {
+               zval *args, *connection = NULL;
+
+               MAKE_STD_ZVAL(args);
+               array_init(args);
+               php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
+               add_next_index_zval(args, connection);
+               zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+               zval_ptr_dtor(&args);
+       }
 }
-static void php_pqconn_event_conndestroy(PGEventConnDestroy *event, php_pqconn_event_data_t *data)
+
+static zval *result_instance_zval(PGresult *res TSRMLS_DC)
 {
-       PQsetInstanceData(event->conn, php_pqconn_event, NULL);
-       efree(data);
+       zval *rid = PQresultInstanceData(res, php_pqconn_event);
+
+       if (!rid) {
+               php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+               MAKE_STD_ZVAL(rid);
+               r->res = res;
+               ZEND_INIT_SYMTABLE(&r->bound);
+               rid->type = IS_OBJECT;
+               rid->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+
+               PQresultSetInstanceData(res, php_pqconn_event, rid);
+       }
+
+       Z_ADDREF_P(rid);
+       return rid;
 }
+
 static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data)
 {
+       zval **evhs;
        TSRMLS_DF(data);
 
-       if (data->obj->onevent.fci.size > 0) {
-               zval *res;
-
-               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);
+       /* event listener */
+       if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("result"), (void *) &evhs)) {
+               zval *args, *connection = NULL, *res = result_instance_zval(event->result TSRMLS_CC);
+
+               MAKE_STD_ZVAL(args);
+               array_init(args);
+               php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
+               add_next_index_zval(args, connection);
+               add_next_index_zval(args, res);
+               zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+               zval_ptr_dtor(&args);
+       }
 
-               Z_ADDREF_P(res);
-               PQresultSetInstanceData(event->result, php_pqconn_event, res);
+       /* async callback */
+       if (data->obj->intern->onevent.fci.size > 0) {
+               zval *res = result_instance_zval(event->result TSRMLS_CC);
 
-               zend_fcall_info_argn(&data->obj->onevent.fci TSRMLS_CC, 1, &res);
-               zend_fcall_info_call(&data->obj->onevent.fci, &data->obj->onevent.fcc, NULL, NULL TSRMLS_CC);
+               zend_fcall_info_argn(&data->obj->intern->onevent.fci TSRMLS_CC, 1, &res);
+               zend_fcall_info_call(&data->obj->intern->onevent.fci, &data->obj->intern->onevent.fcc, NULL, NULL TSRMLS_CC);
                zval_ptr_dtor(&res);
        }
 }
@@ -884,11 +1686,8 @@ static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn
 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);
+       case PGEVT_CONNRESET:
+               php_pqconn_event_connreset(e, data);
                break;
        case PGEVT_RESULTCREATE:
                php_pqconn_event_resultcreate(e, data);
@@ -910,34 +1709,92 @@ static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *
        return data;
 }
 
+static void php_pqconn_notice_recv(void *p, const PGresult *res)
+{
+       php_pqconn_event_data_t *data = p;
+       zval **evhs;
+       TSRMLS_DF(data);
+
+       if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("notice"), (void *) &evhs)) {
+               zval *args, *connection = NULL;
+
+               MAKE_STD_ZVAL(args);
+               array_init(args);
+               php_pq_object_to_zval(data->obj, &connection TSRMLS_CC);
+               add_next_index_zval(args, connection);
+               add_next_index_string(args, PHP_PQresultErrorMessage(res), 1);
+               zend_hash_apply_with_argument(Z_ARRVAL_PP(evhs), apply_event, args TSRMLS_CC);
+               zval_ptr_dtor(&args);
+       }
+}
+
+typedef struct php_pqconn_resource_factory_data {
+       char *dsn;
+       long flags;
+} php_pqconn_resource_factory_data_t;
+
+static void *php_pqconn_resource_factory_ctor(void *data, void *init_arg TSRMLS_DC)
+{
+       php_pqconn_resource_factory_data_t *o = init_arg;
+
+       if (o->flags & PHP_PQCONN_ASYNC) {
+               return PQconnectStart(o->dsn);
+       } else {
+               return PQconnectdb(o->dsn);
+       }
+}
+
+static void php_pqconn_resource_factory_dtor(void *opaque, void *handle TSRMLS_DC)
+{
+       PQfinish(handle);
+}
+
+static php_resource_factory_ops_t php_pqconn_resource_factory_ops = {
+       php_pqconn_resource_factory_ctor,
+       NULL,
+       php_pqconn_resource_factory_dtor
+};
+
 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;
+       char *dsn_str = "";
+       int dsn_len = 0;
+       long flags = 0;
 
        zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &dsn_str, &dsn_len, &async)) {
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &dsn_str, &dsn_len, &flags)) {
                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);
+               php_pqconn_event_data_t *evdata =  php_pqconn_event_data_init(obj TSRMLS_CC);
+               php_pqconn_resource_factory_data_t rfdata = {dsn_str, flags};
+
+               obj->intern = ecalloc(1, sizeof(*obj->intern));
 
-               if (obj->conn) {
-                       PQfinish(obj->conn);
+               zend_hash_init(&obj->intern->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0);
+               zend_hash_init(&obj->intern->eventhandlers, 0, NULL, ZVAL_PTR_DTOR, 0);
+
+               if (flags & PHP_PQCONN_PERSISTENT) {
+                       php_persistent_handle_factory_t *phf = php_persistent_handle_concede(NULL, ZEND_STRL("pq\\Connection"), dsn_str, dsn_len TSRMLS_CC);
+                       php_resource_factory_init(&obj->intern->factory, php_persistent_handle_get_resource_factory_ops(), phf, (void (*)(void*)) php_persistent_handle_abandon);
+               } else{
+                       php_resource_factory_init(&obj->intern->factory, &php_pqconn_resource_factory_ops, NULL, NULL);
                }
-               if (async) {
-                       obj->conn = PQconnectStart(dsn_str);
-                       obj->poller = (int (*)(PGconn*)) PQconnectPoll;
-               } else {
-                       obj->conn = PQconnectdb(dsn_str);
+               if (flags & PHP_PQCONN_ASYNC) {
+                       obj->intern->poller = (int (*)(PGconn*)) PQconnectPoll;
                }
-               
-               PQregisterEventProc(obj->conn, php_pqconn_event, "ext-pq", data);
+
+               obj->intern->conn = php_resource_factory_handle_ctor(&obj->intern->factory, &rfdata TSRMLS_CC);
+
+               PQregisterEventProc(obj->intern->conn, php_pqconn_event, "ext-pq", evdata);
+               /* the connection might be persistent, so reset event_proc instance data */
+               PQsetInstanceData(obj->intern->conn, php_pqconn_event, evdata);
+               PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, evdata);
+
                if (SUCCESS != php_pqconn_update_socket(getThis(), obj TSRMLS_CC)) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed: %s", PQerrorMessage(obj->conn));
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection failed (%s)", PHP_PQerrorMessage(obj->intern->conn));
                }
        }
        zend_restore_error_handling(&zeh TSRMLS_CC);
@@ -949,13 +1806,13 @@ 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 (obj->intern) {
+                       PQreset(obj->intern->conn);
 
-                       if (CONNECTION_OK == PQstatus(obj->conn)) {
+                       if (CONNECTION_OK == PQstatus(obj->intern->conn)) {
                                RETURN_TRUE;
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection reset failed: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection reset failed: (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -970,9 +1827,9 @@ 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;
+               if (obj->intern) {
+                       if (PQresetStart(obj->intern->conn)) {
+                               obj->intern->poller = (int (*)(PGconn*)) PQresetPoll;
                                RETURN_TRUE;
                        }
                } else {
@@ -988,25 +1845,12 @@ static void php_pqconn_add_listener(php_pqconn_object_t *obj, const char *channe
 
        php_pq_callback_addref(listener);
 
-       if (SUCCESS == zend_hash_find(&obj->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) {
+       if (SUCCESS == zend_hash_find(&obj->intern->listeners, channel_str, channel_len + 1, (void *) &existing_listeners)) {
                zend_hash_next_index_insert(existing_listeners, (void *) listener, sizeof(*listener), NULL);
        } else {
                zend_hash_init(&ht, 1, NULL, (dtor_func_t) php_pq_callback_dtor, 0);
                zend_hash_next_index_insert(&ht, (void *) listener, sizeof(*listener), NULL);
-               zend_hash_add(&obj->listeners, channel_str, channel_len + 1, (void *) &ht, sizeof(HashTable), NULL);
-       }
-}
-
-static STATUS php_pqres_success(PGresult *res TSRMLS_DC)
-{
-       switch (PQresultStatus(res)) {
-       case PGRES_BAD_RESPONSE:
-       case PGRES_NONFATAL_ERROR:
-       case PGRES_FATAL_ERROR:
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", PQresultErrorMessage(res));
-               return FAILURE;
-       default:
-               return SUCCESS;
+               zend_hash_add(&obj->intern->listeners, channel_str, channel_len + 1, (void *) &ht, sizeof(HashTable), NULL);
        }
 }
 
@@ -1022,22 +1866,21 @@ static PHP_METHOD(pqconn, listen) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               obj->poller = PQconsumeInput;
+               obj->intern->poller = PQconsumeInput;
 
-               if (obj->conn) {
-                       char *quoted_channel = PQescapeIdentifier(obj->conn, channel_str, channel_len);
+               if (obj->intern) {
+                       char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
 
                        if (quoted_channel) {
                                PGresult *res;
                                char *cmd;
 
                                spprintf(&cmd, 0, "LISTEN %s", channel_str);
-                               res = PQexec(obj->conn, cmd);
+                               res = PQexec(obj->intern->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);
@@ -1045,15 +1888,15 @@ static PHP_METHOD(pqconn, listen) {
                                        } else {
                                                RETVAL_FALSE;
                                        }
-                                       PQclear(res);
+                                       PHP_PQclear(res);
                                } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener: %s", PQerrorMessage(obj->conn));
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                        RETVAL_FALSE;
                                }
 
-                               php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                               php_pqconn_notify_listeners(obj TSRMLS_CC);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape channel identifier: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape channel identifier (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -1073,11 +1916,11 @@ static PHP_METHOD(pqconn, notify) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
+               if (obj->intern) {
                        PGresult *res;
                        char *params[2] = {channel_str, message_str};
 
-                       res = PQexecParams(obj->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0);
+                       res = PQexecParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0);
 
                        if (res) {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
@@ -1085,13 +1928,13 @@ static PHP_METHOD(pqconn, notify) {
                                } else {
                                        RETVAL_FALSE;
                                }
-                               PQclear(res);
+                               PHP_PQclear(res);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
 
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
 
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -1106,14 +1949,14 @@ 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);
+               if (obj->intern) {
+                       if (obj->intern->poller) {
+                               if (obj->intern->poller == PQconsumeInput) {
+                                       RETVAL_LONG(obj->intern->poller(obj->intern->conn) * PGRES_POLLING_OK);
+                                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                                        return;
                                } else {
-                                       RETURN_LONG(obj->poller(obj->conn));
+                                       RETURN_LONG(obj->intern->poller(obj->intern->conn));
                                }
                        } else {
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "No asynchronous operation active");
@@ -1137,18 +1980,22 @@ static PHP_METHOD(pqconn, exec) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &query_str, &query_len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
-                       PGresult *res = PQexec(obj->conn, query_str);
+               if (obj->intern) {
+                       PGresult *res = PQexec(obj->intern->conn, query_str);
 
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
 
                        if (res) {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+                                       r->res = res;
+                                       ZEND_INIT_SYMTABLE(&r->bound);
                                        return_value->type = IS_OBJECT;
-                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
                                }
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -1163,12 +2010,16 @@ 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 (obj->intern) {
+                       PGresult *res = PQgetResult(obj->intern->conn);
 
                        if (res) {
+                               php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+                               r->res = res;
+                               ZEND_INIT_SYMTABLE(&r->bound);
                                return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
                        } else {
                                RETVAL_NULL();
                        }
@@ -1185,7 +2036,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_async, 0, 0, 1)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, execAsync) {
        zend_error_handling zeh;
-       php_pq_callback_t resolver;
+       php_pq_callback_t resolver = {{0}};
        char *query_str;
        int query_len;
 
@@ -1193,24 +2044,24 @@ static PHP_METHOD(pqconn, execAsync) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|f", &query_str, &query_len, &resolver.fci, &resolver.fcc)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
-                       php_pq_callback_dtor(&obj->onevent);
+               if (obj->intern) {
+                       php_pq_callback_dtor(&obj->intern->onevent);
                        if (resolver.fci.size > 0) {
-                               obj->onevent = resolver;
-                               php_pq_callback_addref(&obj->onevent);
+                               obj->intern->onevent = resolver;
+                               php_pq_callback_addref(&obj->intern->onevent);
                        }
 
-                       obj->poller = PQconsumeInput;
+                       obj->intern->poller = PQconsumeInput;
 
-                       if (PQsendQuery(obj->conn, query_str)) {
-                               if (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));
+                       if (PQsendQuery(obj->intern->conn, query_str)) {
+                               if (obj->intern->unbuffered) {
+                                       if (!PQsetSingleRowMode(obj->intern->conn)) {
+                                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                        }
                                }
                                RETVAL_TRUE;
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1315,7 +2166,7 @@ static PHP_METHOD(pqconn, execParams) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!", &query_str, &query_len, &zparams, &ztypes)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
+               if (obj->intern) {
                        PGresult *res;
                        int count;
                        Oid *types = NULL;
@@ -1329,7 +2180,7 @@ static PHP_METHOD(pqconn, execParams) {
                                php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
                        }
 
-                       res = PQexecParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0);
+                       res = PQexecParams(obj->intern->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0);
 
                        zend_hash_destroy(&zdtor);
                        if (types) {
@@ -1339,15 +2190,19 @@ static PHP_METHOD(pqconn, execParams) {
                                efree(params);
                        }
 
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
 
                        if (res) {
                                if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+                                       r->res = res;
+                                       ZEND_INIT_SYMTABLE(&r->bound);
                                        return_value->type = IS_OBJECT;
-                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, res, NULL TSRMLS_CC);
+                                       return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
                                }
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1366,7 +2221,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params_async, 0, 0, 2)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, execParamsAsync) {
        zend_error_handling zeh;
-       php_pq_callback_t resolver;
+       php_pq_callback_t resolver = {{0}};
        char *query_str;
        int query_len;
        zval *zparams;
@@ -1376,7 +2231,7 @@ static PHP_METHOD(pqconn, execParamsAsync) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa/|a/!f", &query_str, &query_len, &zparams, &ztypes, &resolver.fci, &resolver.fcc)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
+               if (obj->intern) {
                        int count;
                        Oid *types = NULL;
                        char **params = NULL;
@@ -1389,23 +2244,23 @@ static PHP_METHOD(pqconn, execParamsAsync) {
                                php_pq_types_to_array(Z_ARRVAL_P(ztypes), &types TSRMLS_CC);
                        }
 
-                       php_pq_callback_dtor(&obj->onevent);
+                       php_pq_callback_dtor(&obj->intern->onevent);
                        if (resolver.fci.size > 0) {
-                               obj->onevent = resolver;
-                               php_pq_callback_addref(&obj->onevent);
+                               obj->intern->onevent = resolver;
+                               php_pq_callback_addref(&obj->intern->onevent);
                        }
 
-                       obj->poller = PQconsumeInput;
+                       obj->intern->poller = PQconsumeInput;
 
-                       if (PQsendQueryParams(obj->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
-                               if (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));
+                       if (PQsendQueryParams(obj->intern->conn, query_str, count, types, (const char *const*) params, NULL, NULL, 0)) {
+                               if (obj->intern->unbuffered) {
+                                       if (!PQsetSingleRowMode(obj->intern->conn)) {
+                                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                        }
                                }
                                RETVAL_TRUE;
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
 
@@ -1417,7 +2272,7 @@ static PHP_METHOD(pqconn, execParamsAsync) {
                                efree(params);
                        }
 
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
 
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -1443,7 +2298,7 @@ static STATUS php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, const c
                php_pq_types_to_array(typest, &types TSRMLS_CC);
        }
        
-       res = PQprepare(obj->conn, name, query, count, types);
+       res = PQprepare(obj->intern->conn, name, query, count, types);
 
        if (types) {
                efree(types);
@@ -1451,17 +2306,17 @@ static STATUS php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, const c
 
        if (res) {
                rv = php_pqres_success(res TSRMLS_CC);
-               PQclear(res);
+               PHP_PQclear(res);
        } else {
                rv = FAILURE;
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
        }
        
        return rv;
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare, 0, 0, 2)
-       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_ARRAY_INFO(0, types, 1)
 ZEND_END_ARG_INFO();
@@ -1475,12 +2330,19 @@ static PHP_METHOD(pqconn, prepare) {
        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->intern) {
                        if (SUCCESS == php_pqconn_prepare(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                               php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
+
+                               php_pq_object_addref(obj TSRMLS_CC);
+                               stm->conn = obj;
+                               stm->name = estrdup(name_str);
+                               ZEND_INIT_SYMTABLE(&stm->bound);
+
                                return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC);
+                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, NULL TSRMLS_CC);
                        }
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
                }
@@ -1502,15 +2364,15 @@ static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, c
                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));
+       if (PQsendPrepare(obj->intern->conn, name, query, count, types)) {
+               if (obj->intern->unbuffered) {
+                       if (!PQsetSingleRowMode(obj->intern->conn)) {
+                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
                        }
                }
                rv = SUCCESS;
        } else {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement: %s", PQerrorMessage(obj->conn));
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
                rv = FAILURE;
        }
        
@@ -1522,7 +2384,7 @@ static STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, c
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_prepare_async, 0, 0, 2)
-ZEND_ARG_INFO(0, name)
+ZEND_ARG_INFO(0, type)
        ZEND_ARG_INFO(0, query)
        ZEND_ARG_ARRAY_INFO(0, types, 1)
 ZEND_END_ARG_INFO();
@@ -1536,13 +2398,20 @@ static PHP_METHOD(pqconn, prepareAsync) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!", &name_str, &name_len, &query_str, &query_len, &ztypes)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
-                       obj->poller = PQconsumeInput;
+               if (obj->intern) {
+                       obj->intern->poller = PQconsumeInput;
                        if (SUCCESS == php_pqconn_prepare_async(getThis(), obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC)) {
+                               php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
+
+                               php_pq_object_addref(obj TSRMLS_CC);
+                               stm->conn = obj;
+                               stm->name = estrdup(name_str);
+                               ZEND_INIT_SYMTABLE(&stm->bound);
+
                                return_value->type = IS_OBJECT;
-                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, getThis(), name_str, NULL TSRMLS_CC);
+                               return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, NULL TSRMLS_CC);
                        }
-                       php_pqconn_notify_listeners(getThis(), obj TSRMLS_CC);
+                       php_pqconn_notify_listeners(obj TSRMLS_CC);
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
                }
@@ -1560,14 +2429,14 @@ static PHP_METHOD(pqconn, quote) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
-                       char *quoted = PQescapeLiteral(obj->conn, str, len);
+               if (obj->intern) {
+                       char *quoted = PQescapeLiteral(obj->intern->conn, str, len);
 
                        if (quoted) {
                                RETVAL_STRING(quoted, 1);
                                PQfreemem(quoted);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote string: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote string (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1578,7 +2447,7 @@ static PHP_METHOD(pqconn, quote) {
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_quote_name, 0, 0, 1)
-       ZEND_ARG_INFO(0, name)
+       ZEND_ARG_INFO(0, type)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, quoteName) {
        char *str;
@@ -1587,14 +2456,14 @@ static PHP_METHOD(pqconn, quoteName) {
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) {
                php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-               if (obj->conn) {
-                       char *quoted = PQescapeIdentifier(obj->conn, str, len);
+               if (obj->intern) {
+                       char *quoted = PQescapeIdentifier(obj->intern->conn, str, len);
 
                        if (quoted) {
                                RETVAL_STRING(quoted, 1);
                                PQfreemem(quoted);
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote name: %s", PQerrorMessage(obj->conn));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not quote name (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1614,15 +2483,15 @@ static PHP_METHOD(pqconn, escapeBytea) {
        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->intern) {
                        size_t escaped_len;
-                       char *escaped_str = (char *) PQescapeByteaConn(obj->conn, (unsigned char *) str, len, &escaped_len);
+                       char *escaped_str = (char *) PQescapeByteaConn(obj->intern->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));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not escape bytea (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1642,7 +2511,7 @@ static PHP_METHOD(pqconn, unescapeBytea) {
        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->intern) {
                        size_t unescaped_len;
                        char *unescaped_str = (char *) PQunescapeBytea((unsigned char *)str, &unescaped_len);
 
@@ -1650,7 +2519,7 @@ static PHP_METHOD(pqconn, unescapeBytea) {
                                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));
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not unescape bytea (%s)", PHP_PQerrorMessage(obj->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
@@ -1660,158 +2529,1832 @@ static PHP_METHOD(pqconn, unescapeBytea) {
        }
 }
 
-static zend_function_entry php_pqconn_methods[] = {
-       PHP_ME(pqconn, __construct, ai_pqconn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-       PHP_ME(pqconn, reset, ai_pqconn_reset, ZEND_ACC_PUBLIC)
-       PHP_ME(pqconn, resetAsync, ai_pqconn_reset_async, ZEND_ACC_PUBLIC)
-       PHP_ME(pqconn, poll, ai_pqconn_poll, ZEND_ACC_PUBLIC)
-       PHP_ME(pqconn, exec, ai_pqconn_exec, ZEND_ACC_PUBLIC)
-       PHP_ME(pqconn, execAsync, ai_pqconn_exec_async, ZEND_ACC_PUBLIC)
-       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}
-};
+static const char *isolation_level(long *isolation) {
+       switch (*isolation) {
+       case PHP_PQTXN_SERIALIZABLE:
+               return "SERIALIZABLE";
+       case PHP_PQTXN_REPEATABLE_READ:
+               return "REPEATABLE READ";
+       default:
+               *isolation = PHP_PQTXN_READ_COMMITTED;
+               /* no break */
+       case PHP_PQTXN_READ_COMMITTED:
+               return "READ COMMITTED";
+       }
+}
 
-static zval **php_pqres_iteration(zval *this_ptr, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type TSRMLS_DC)
+static STATUS php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *conn_obj, long isolation, zend_bool readonly, zend_bool deferrable TSRMLS_DC)
 {
-       zval **row = NULL;
-       php_pqres_fetch_t orig_fetch;
+       if (!conn_obj) {
+               conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+       }
 
-       if (!obj) {
-        obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       if (conn_obj->intern) {
+               PGresult *res;
+               char *cmd;
+
+               spprintf(&cmd, 0, "START TRANSACTION ISOLATION LEVEL %s, READ %s, %s DEFERRABLE",
+                               isolation_level(&isolation), readonly ? "ONLY" : "WRITE", deferrable ? "": "NOT");
+
+               res = PQexec(conn_obj->intern->conn, cmd);
+
+               efree(cmd);
+
+               if (res) {
+                       STATUS rv = php_pqres_success(res TSRMLS_CC);
+
+                       PHP_PQclear(res);
+                       return rv;
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       return FAILURE;
+               }
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               return FAILURE;
+       }
+}
+
+static STATUS php_pqconn_start_transaction_async(zval *zconn, php_pqconn_object_t *conn_obj, long isolation, zend_bool readonly, zend_bool deferrable TSRMLS_DC)
+{
+       if (!conn_obj) {
+               conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
        }
 
-       if (!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);
+       if (conn_obj->intern->conn) {
+               char *cmd;
+
+               spprintf(&cmd, 0, "START TRANSACTION ISOLATION LEVEL %s, READ %s, %s DEFERRABLE",
+                               isolation_level(&isolation), readonly ? "ONLY" : "WRITE", deferrable ? "": "NOT");
+
+               if (PQsendQuery(conn_obj->intern->conn, cmd)) {
+                       conn_obj->intern->poller = PQconsumeInput;
+                       efree(cmd);
+                       return SUCCESS;
+               } else {
+                       efree(cmd);
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       return FAILURE;
+               }
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               return FAILURE;
        }
-       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);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_start_transaction, 0, 0, 0)
+       ZEND_ARG_INFO(0, isolation)
+       ZEND_ARG_INFO(0, readonly)
+       ZEND_ARG_INFO(0, deferrable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, startTransaction) {
+       zend_error_handling zeh;
+       long isolation = PHP_PQTXN_READ_COMMITTED;
+       zend_bool readonly = 0, deferrable = 0;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lbb", &isolation, &readonly, &deferrable)) {
+               STATUS rv;
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               rv = php_pqconn_start_transaction(getThis(), obj, isolation, readonly, deferrable TSRMLS_CC);
+
+               if (SUCCESS == rv) {
+                       php_pqtxn_t *txn = ecalloc(1, sizeof(*txn));
+
+                       php_pq_object_addref(obj TSRMLS_CC);
+                       txn->conn = obj;
+                       txn->isolation = isolation;
+                       txn->readonly = readonly;
+                       txn->deferrable = deferrable;
+
+                       return_value->type = IS_OBJECT;
+                       return_value->value.obj = php_pqtxn_create_object_ex(php_pqtxn_class_entry, txn, NULL TSRMLS_CC);
+               }
        }
-       obj->iter->fetch_type = orig_fetch;
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_start_transaction_async, 0, 0, 0)
+       ZEND_ARG_INFO(0, isolation)
+       ZEND_ARG_INFO(0, readonly)
+       ZEND_ARG_INFO(0, deferrable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, startTransactionAsync) {
+       zend_error_handling zeh;
+       long isolation = PHP_PQTXN_READ_COMMITTED;
+       zend_bool readonly = 0, deferrable = 0;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lbb", &isolation, &readonly, &deferrable)) {
+               STATUS rv;
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               rv = php_pqconn_start_transaction_async(getThis(), obj, isolation, readonly, deferrable TSRMLS_CC);
+
+               if (SUCCESS == rv) {
+                       php_pqtxn_t *txn = ecalloc(1, sizeof(*txn));
+
+                       php_pq_object_addref(obj TSRMLS_CC);
+                       txn->conn = obj;
+                       txn->isolation = isolation;
+                       txn->readonly = readonly;
+                       txn->deferrable = deferrable;
+
+                       return_value->type = IS_OBJECT;
+                       return_value->value.obj = php_pqtxn_create_object_ex(php_pqtxn_class_entry, txn, NULL TSRMLS_CC);
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_trace, 0, 0, 0)
+       ZEND_ARG_INFO(0, stdio_stream)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, trace) {
+       zval *zstream = NULL;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) {
+               php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+               if (obj->intern) {
+                       if (zstream) {
+                               FILE *fp;
+                               php_stream *stream = NULL;
+
+                               php_stream_from_zval(stream, &zstream);
+
+                               if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void *) &fp, REPORT_ERRORS)) {
+                                       stream->flags |= PHP_STREAM_FLAG_NO_CLOSE;
+                                       PQtrace(obj->intern->conn, fp);
+                                       RETVAL_TRUE;
+                               } else {
+                                       RETVAL_FALSE;
+                               }
+                       } else {
+                               PQuntrace(obj->intern->conn);
+                               RETVAL_TRUE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+static zend_function_entry php_pqconn_methods[] = {
+       PHP_ME(pqconn, __construct, ai_pqconn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqconn, reset, ai_pqconn_reset, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, resetAsync, ai_pqconn_reset_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, poll, ai_pqconn_poll, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, exec, ai_pqconn_exec, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execAsync, ai_pqconn_exec_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execParams, ai_pqconn_exec_params, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, execParamsAsync, ai_pqconn_exec_params_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, prepare, ai_pqconn_prepare, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, prepareAsync, ai_pqconn_prepare_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, listen, ai_pqconn_listen, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, notify, ai_pqconn_notify, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, getResult, ai_pqconn_get_result, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, quote, ai_pqconn_quote, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, quoteName, ai_pqconn_quote_name, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, escapeBytea, ai_pqconn_escape_bytea, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, unescapeBytea, ai_pqconn_unescape_bytea, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, startTransaction, ai_pqconn_start_transaction, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, startTransactionAsync, ai_pqconn_start_transaction_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqconn, trace, ai_pqconn_trace, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_construct, 0, 0, 1)
+       ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtypes, __construct) {
+       zend_error_handling zeh;
+       zval *zconn;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry)) {
+               php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+
+               if (conn_obj->intern) {
+                       zval *retval = NULL;
+                       php_pqtypes_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+                       obj->intern = ecalloc(1, sizeof(*obj->intern));
+                       obj->intern->conn = conn_obj;
+                       php_pq_object_addref(conn_obj TSRMLS_CC);
+                       zend_hash_init(&obj->intern->types, 300, NULL, ZVAL_PTR_DTOR, 0);
+
+                       zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval);
+                       if (retval) {
+                               zval_ptr_dtor(&retval);
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+#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')"
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_refresh, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtypes, refresh) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtypes_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       PGresult *res = PQexec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY);
+
+                       php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
+
+                       if (res) {
+                               if (PGRES_TUPLES_OK == PQresultStatus(res)) {
+                                       int r, rows;
+
+                                       for (r = 0, rows = PQntuples(res); r < rows; ++r) {
+                                               zval *row = php_pqres_row_to_zval(res, r, PHP_PQRES_FETCH_OBJECT, NULL TSRMLS_CC);
+                                               long oid = atol(PQgetvalue(res, r, 0 ));
+                                               char *name = PQgetvalue(res, r, 1);
+
+                                               Z_ADDREF_P(row);
+
+                                               zend_hash_index_update(&obj->intern->types, oid, (void *) &row, sizeof(zval *), NULL);
+                                               zend_hash_add(&obj->intern->types, name, strlen(name) + 1, (void *) &row, sizeof(zval *), NULL);
+                                       }
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types (%s)", PHP_PQresultErrorMessage(res));
+                               }
+                               PHP_PQclear(res);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not fetch types (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Types not initialized");
+               }
+       }
+}
+
+static zend_function_entry php_pqtypes_methods[] = {
+       PHP_ME(pqtypes, __construct, ai_pqtypes_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqtypes, refresh, ai_pqtypes_refresh, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+static STATUS php_pqres_iteration(zval *this_ptr, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type, zval ***row TSRMLS_DC)
+{
+       STATUS rv;
+       php_pqres_fetch_t orig_fetch;
+
+       if (!obj) {
+        obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       }
+
+       if (!obj->intern->iter) {
+               obj->intern->iter = (php_pqres_iterator_t *) php_pqres_iterator_init(Z_OBJCE_P(getThis()), getThis(), 0 TSRMLS_CC);
+               obj->intern->iter->zi.funcs->rewind((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+       }
+       orig_fetch = obj->intern->iter->fetch_type;
+       obj->intern->iter->fetch_type = fetch_type;
+       if (SUCCESS == (rv = obj->intern->iter->zi.funcs->valid((zend_object_iterator *) obj->intern->iter TSRMLS_CC))) {
+               obj->intern->iter->zi.funcs->get_current_data((zend_object_iterator *) obj->intern->iter, row TSRMLS_CC);
+               obj->intern->iter->zi.funcs->move_forward((zend_object_iterator *) obj->intern->iter TSRMLS_CC);
+       }
+       obj->intern->iter->fetch_type = orig_fetch;
+
+       return rv;
+}
+
+typedef struct php_pqres_col {
+       char *name;
+       int num;
+} php_pqres_col_t;
+
+static STATUS column_nn(php_pqres_object_t *obj, zval *zcol, php_pqres_col_t *col TSRMLS_DC)
+{
+       long index = -1;
+       char *name = NULL;
+
+       switch (Z_TYPE_P(zcol)) {
+       default:
+               convert_to_string(zcol);
+               /* no break */
+
+       case IS_STRING:
+               if (!is_numeric_string(Z_STRVAL_P(zcol), Z_STRLEN_P(zcol), &index, NULL, 0)) {
+                       name = Z_STRVAL_P(zcol);
+               }
+               break;
+
+       case IS_LONG:
+               index = Z_LVAL_P(zcol);
+               break;
+       }
+
+       if (name) {
+               col->name = name;
+               col->num = PQfnumber(obj->intern->res, name);
+       } else {
+               col->name = PQfname(obj->intern->res, index);
+               col->num = index;
+       }
+
+       if (!col->name) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to find column at index %ld", index);
+               return FAILURE;
+       }
+       if (col->num == -1) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to find column with name '%s'", name);
+               return FAILURE;
+       }
+       return SUCCESS;
+}
+
+static int compare_index(const void *lptr, const void *rptr TSRMLS_DC)
+{
+       const Bucket *l = *(const Bucket **) lptr;
+       const Bucket *r = *(const Bucket **) rptr;
+
+       if (l->h < r->h) {
+               return -1;
+       }
+       if (l->h > r->h) {
+               return 1;
+       }
+       return 0;
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_bind, 0, 0, 2)
+       ZEND_ARG_INFO(0, col)
+       ZEND_ARG_INFO(1, ref)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, bind) {
+       zval *zcol, *zref;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z", &zcol, &zref)) {
+               php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       php_pqres_col_t col;
+
+                       if (SUCCESS == column_nn(obj, zcol, &col TSRMLS_CC)) {
+                               Z_ADDREF_P(zref);
+                               if (SUCCESS == zend_hash_index_update(&obj->intern->bound, col.num, (void *) &zref, sizeof(zval *), NULL)) {
+                                       zend_hash_sort(&obj->intern->bound, zend_qsort, compare_index, 0 TSRMLS_CC);
+                                       RETVAL_TRUE;
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to bind column %s@%d", col.name, col.num);
+                                       RETVAL_FALSE;
+                               }
+                       } else {
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Result not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+static int apply_bound(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       zval **zvalue, **zbound = p;
+       zval **zrow = va_arg(argv, zval **);
+
+       if (SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(zrow), key->h, (void *) &zvalue)) {
+               zval_dtor(*zbound);
+               ZVAL_COPY_VALUE(*zbound, *zvalue);
+               ZVAL_NULL(*zvalue);
+               zval_ptr_dtor(zvalue);
+               Z_ADDREF_P(*zbound);
+               *zvalue = *zbound;
+               return ZEND_HASH_APPLY_KEEP;
+       } else {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to find column ad index %lu", key->h);
+               return ZEND_HASH_APPLY_STOP;
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_bound, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, fetchBound) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       zval **row = NULL;
+
+                       if (SUCCESS == php_pqres_iteration(getThis(), obj, PHP_PQRES_FETCH_ARRAY, &row TSRMLS_CC)) {
+                               if (row) {
+                                       zend_hash_apply_with_arguments(&obj->intern->bound TSRMLS_CC, apply_bound, 1, row);
+                                       RETVAL_ZVAL(*row, 1, 0);
+                               }
+                       }
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_row, 0, 0, 0)
+       ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, fetchRow) {
+       zend_error_handling zeh;
+       php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       long fetch_type = -1;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_type)) {
+               if (obj->intern) {
+                       zval **row = NULL;
+
+                       if (fetch_type == -1) {
+                                fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+                       }
+                       php_pqres_iteration(getThis(), obj, fetch_type, &row TSRMLS_CC);
+
+                       if (row) {
+                               RETVAL_ZVAL(*row, 1, 0);
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Result not initialized");
+               }
+       }
+       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);
+
+               if (obj->intern) {
+                       zval **row = NULL;
+
+                       php_pqres_iteration(getThis(), obj, obj->intern->iter ? obj->intern->iter->fetch_type : 0, &row TSRMLS_CC);
+
+                       if (row) {
+                               zval **col = column_at(*row, fetch_col TSRMLS_CC);
+
+                               if (col) {
+                                       RETVAL_ZVAL(*col, 1, 0);
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Result not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+static int apply_to_col(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+       zval **c = p;
+       php_pqres_object_t *obj = va_arg(argv, php_pqres_object_t *);
+       php_pqres_col_t *col, **cols = va_arg(argv, php_pqres_col_t **);
+       STATUS *rv = va_arg(argv, STATUS *);
+
+       col = *cols;
+       if (SUCCESS == column_nn(obj, *c, col TSRMLS_CC)) {
+               *rv = SUCCESS;
+       } else {
+               *rv = FAILURE;
+               return ZEND_HASH_APPLY_STOP;
+       }
+       ++*cols;
+
+       return ZEND_HASH_APPLY_KEEP;
+}
+
+static php_pqres_col_t *php_pqres_convert_to_cols(php_pqres_object_t *obj, HashTable *ht TSRMLS_DC)
+{
+       php_pqres_col_t *tmp, *cols = ecalloc(zend_hash_num_elements(ht), sizeof(*cols));
+       STATUS rv = SUCCESS;
+
+       tmp = cols;
+       zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_col, 2, obj, &tmp, &rv);
+
+       if (SUCCESS == rv) {
+               return cols;
+       } else {
+               efree(cols);
+               return NULL;
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_map, 0, 0, 0)
+       ZEND_ARG_INFO(0, keys)
+       ZEND_ARG_INFO(0, vals)
+       ZEND_ARG_INFO(0, fetch_type)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, map) {
+       zend_error_handling zeh;
+       zval *zkeys = 0, *zvals = 0;
+       long fetch_type = -1;
+
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/!z/!l", &zkeys, &zvals, &fetch_type)) {
+               php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       int ks = 0, vs = 0;
+                       php_pqres_col_t def = {PQfname(obj->intern->res, 0), 0}, *keys = NULL, *vals = NULL;
+
+                       if (zkeys) {
+                               convert_to_array(zkeys);
+
+                               if ((ks = zend_hash_num_elements(Z_ARRVAL_P(zkeys)))) {
+                                       keys = php_pqres_convert_to_cols(obj, Z_ARRVAL_P(zkeys) TSRMLS_CC);
+                               } else {
+                                       ks = 1;
+                                       keys = &def;
+                               }
+                       } else {
+                               ks = 1;
+                               keys = &def;
+                       }
+                       if (zvals) {
+                               convert_to_array(zvals);
+
+                               if ((vs = zend_hash_num_elements(Z_ARRVAL_P(zvals)))) {
+                                       vals = php_pqres_convert_to_cols(obj, Z_ARRVAL_P(zvals) TSRMLS_CC);
+                               }
+                       }
+
+                       if (fetch_type == -1) {
+                               fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+                       }
+
+                       if (keys) {
+                               int rows, r;
+                               zval **cur;
+
+                               switch (fetch_type) {
+                               case PHP_PQRES_FETCH_ARRAY:
+                               case PHP_PQRES_FETCH_ASSOC:
+                                       array_init(return_value);
+                                       break;
+                               case PHP_PQRES_FETCH_OBJECT:
+                                       object_init(return_value);
+                                       break;
+                               }
+                               for (r = 0, rows = PQntuples(obj->intern->res); r < rows; ++r) {
+                                       int k, v;
+
+                                       cur = &return_value;
+                                       for (k = 0; k < ks; ++k) {
+                                               char *key = PQgetvalue(obj->intern->res, r, keys[k].num);
+                                               int len = PQgetlength(obj->intern->res, r, keys[k].num);
+
+                                               if (SUCCESS != zend_symtable_find(HASH_OF(*cur), key, len + 1, (void *) &cur)) {
+                                                       zval *tmp;
+
+                                                       MAKE_STD_ZVAL(tmp);
+                                                       switch (fetch_type) {
+                                                       case PHP_PQRES_FETCH_ARRAY:
+                                                       case PHP_PQRES_FETCH_ASSOC:
+                                                               array_init(tmp);
+                                                               break;
+                                                       case PHP_PQRES_FETCH_OBJECT:
+                                                               object_init(tmp);
+                                                               break;
+                                                       }
+                                                       if (SUCCESS != zend_symtable_update(HASH_OF(*cur), key, len + 1, (void *) &tmp, sizeof(zval *), (void *) &cur)) {
+                                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create map");
+                                                               goto err;
+                                                       }
+                                               }
+                                       }
+                                       if (vals && vs) {
+                                               for (v = 0; v < vs; ++v) {
+                                                       char *val = PQgetvalue(obj->intern->res, r, vals[v].num);
+                                                       int len = PQgetlength(obj->intern->res, r, vals[v].num);
+
+                                                       switch (fetch_type) {
+                                                       case PHP_PQRES_FETCH_ARRAY:
+                                                               add_index_stringl(*cur, vals[v].num, val, len, 1);
+                                                               break;
+                                                       case PHP_PQRES_FETCH_ASSOC:
+                                                               add_assoc_stringl(*cur, vals[v].name, val, len, 1);
+                                                               break;
+                                                       case PHP_PQRES_FETCH_OBJECT:
+                                                               add_property_stringl(*cur, vals[v].name, val, len, 1);
+                                                               break;
+                                                       }
+                                               }
+                                       } else {
+                                               php_pqres_row_to_zval(obj->intern->res, r, fetch_type, cur TSRMLS_CC);
+                                       }
+                               }
+                       }
+
+                       err:
+                       if (keys && keys != &def) {
+                               efree(keys);
+                       }
+                       if (vals) {
+                               efree(vals);
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Result not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_count, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, count) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               long count;
+
+               if (SUCCESS == php_pqres_count_elements(getThis(), &count TSRMLS_CC)) {
+                       RETVAL_LONG(count);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Result not initialized");
+               }
+       }
+}
+
+static zend_function_entry php_pqres_methods[] = {
+       PHP_ME(pqres, bind, ai_pqres_bind, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, fetchBound, ai_pqres_fetch_bound, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, fetchRow, ai_pqres_fetch_row, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, fetchCol, ai_pqres_fetch_col, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, count, ai_pqres_count, ZEND_ACC_PUBLIC)
+       PHP_ME(pqres, map, ai_pqres_map, 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, type)
+       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->intern) {
+                       STATUS rv;
+                       if (async) {
+                               conn_obj->intern->poller = PQconsumeInput;
+                               rv = php_pqconn_prepare_async(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC);
+                       } else {
+                               rv = php_pqconn_prepare(zconn, conn_obj, name_str, query_str, ztypes ? Z_ARRVAL_P(ztypes) : NULL TSRMLS_CC);
+                               php_pqconn_notify_listeners(conn_obj TSRMLS_CC);
+                       }
+
+                       if (SUCCESS == rv) {
+                               php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
+
+                               php_pq_object_addref(conn_obj TSRMLS_CC);
+                               stm->conn = conn_obj;
+                               stm->name = estrdup(name_str);
+                               ZEND_INIT_SYMTABLE(&stm->bound);
+                               obj->intern = stm;
+                       }
+               } 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_bind, 0, 0, 2)
+       ZEND_ARG_INFO(0, param_no)
+       ZEND_ARG_INFO(1, param_ref)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, bind) {
+       long param_no;
+       zval *param_ref;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz", &param_no, &param_ref)) {
+               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       Z_ADDREF_P(param_ref);
+                       zend_hash_index_update(&obj->intern->bound, param_no, (void *) &param_ref, sizeof(zval *), NULL);
+                       zend_hash_sort(&obj->intern->bound, zend_qsort, compare_index, 0 TSRMLS_CC);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
+               }
+       }
+}
+
+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->intern) {
+                       if (obj->intern->conn->intern) {
+                               int count = 0;
+                               char **params = NULL;
+                               HashTable zdtor;
+                               PGresult *res;
+
+                               ZEND_INIT_SYMTABLE(&zdtor);
+
+                               if (zparams) {
+                                       count = php_pq_params_to_array(Z_ARRVAL_P(zparams), &params, &zdtor TSRMLS_CC);
+                               } else {
+                                       count = php_pq_params_to_array(&obj->intern->bound, &params, &zdtor TSRMLS_CC);
+                               }
+
+                               res = PQexecPrepared(obj->intern->conn->intern->conn, obj->intern->name, count, (const char *const*) params, NULL, NULL, 0);
+
+                               if (params) {
+                                       efree(params);
+                               }
+                               zend_hash_destroy(&zdtor);
+
+                               php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
+
+                               if (res) {
+                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                               php_pqres_t *r = ecalloc(1, sizeof(*r));
+
+                                               r->res = res;
+                                               ZEND_INIT_SYMTABLE(&r->bound);
+                                               return_value->type = IS_OBJECT;
+                                               return_value->value.obj = php_pqres_create_object_ex(php_pqres_class_entry, r, NULL TSRMLS_CC);
+                                       }
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->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 = {{0}};
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!f", &zparams, &resolver.fci, &resolver.fcc)) {
+               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       if (obj->intern->conn->intern) {
+                               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(&obj->intern->conn->intern->onevent);
+                               if (resolver.fci.size > 0) {
+                                       obj->intern->conn->intern->onevent = resolver;
+                                       php_pq_callback_addref(&obj->intern->conn->intern->onevent);
+                               }
+
+                               obj->intern->conn->intern->poller = PQconsumeInput;
+
+                               if (PQsendQueryPrepared(obj->intern->conn->intern->conn, obj->intern->name, count, (const char *const*) params, NULL, NULL, 0)) {
+                                       if (obj->intern->conn->intern->unbuffered) {
+                                               if (!PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
+                                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                               }
+                                       }
+                                       RETVAL_TRUE;
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       RETVAL_FALSE;
+                               }
+
+                               if (params) {
+                                       efree(params);
+                               }
+                               if (zparams) {
+                                       zend_hash_destroy(&zdtor);
+                               }
+
+                               php_pqconn_notify_listeners(obj->intern->conn 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_none()) {
+               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       if (obj->intern->conn->intern) {
+                               PGresult *res = PQdescribePrepared(obj->intern->conn->intern->conn, obj->intern->name);
+
+                               php_pqconn_notify_listeners(obj->intern->conn 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)", PHP_PQerrorMessage(obj->intern->conn->intern->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 php_pqstm_methods[] = {
+       PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqstm, bind, ai_pqstm_bind, ZEND_ACC_PUBLIC)
+       PHP_ME(pqstm, exec, ai_pqstm_exec, ZEND_ACC_PUBLIC)
+       PHP_ME(pqstm, desc, ai_pqstm_desc, ZEND_ACC_PUBLIC)
+       PHP_ME(pqstm, execAsync, ai_pqstm_exec_async, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_construct, 0, 0, 1)
+       ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
+       ZEND_ARG_INFO(0, async)
+       ZEND_ARG_INFO(0, isolation)
+       ZEND_ARG_INFO(0, readonly)
+       ZEND_ARG_INFO(0, deferrable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, __construct) {
+       zend_error_handling zeh;
+       zval *zconn;
+       long isolation = PHP_PQTXN_READ_COMMITTED;
+       zend_bool async = 0, readonly = 0, deferrable = 0;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|blbb", &zconn, php_pqconn_class_entry, &async, &isolation, &readonly, &deferrable)) {
+               STATUS rv;
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+               php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+
+               if (conn_obj->intern) {
+                       if (async) {
+                               rv = php_pqconn_start_transaction_async(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC);
+                       } else {
+                               rv = php_pqconn_start_transaction(zconn, conn_obj, isolation, readonly, deferrable TSRMLS_CC);
+                       }
+
+                       if (SUCCESS == rv) {
+                               obj->intern = ecalloc(1, sizeof(*obj->intern));
+
+                               php_pq_object_addref(conn_obj TSRMLS_CC);
+                               obj->intern->conn = conn_obj;
+                               obj->intern->isolation = isolation;
+                               obj->intern->readonly = readonly;
+                               obj->intern->deferrable = deferrable;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_savepoint, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, savepoint) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       char *cmd;
+                       PGresult *res;
+
+                       spprintf(&cmd, 0, "SAVEPOINT \"%u\"", ++obj->intern->savepoint);
+                       res = PQexec(obj->intern->conn->intern->conn, cmd);
+
+                       if (res) {
+                               php_pqres_success(res TSRMLS_CC);
+                               PHP_PQclear(res);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+
+                       efree(cmd);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_savepoint_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, savepointAsync) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       char *cmd;
+
+                       spprintf(&cmd, 0, "SAVEPOINT \"%u\"", ++obj->intern->savepoint);
+                       if (!PQsendQuery(obj->intern->conn->intern->conn, cmd)) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+
+                       efree(cmd);
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_commit, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, commit) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       PGresult *res;
+
+                       if (obj->intern->savepoint) {
+                               char *cmd;
+
+                               spprintf(&cmd, 0, "RELEASE SAVEPOINT \"%u\"", obj->intern->savepoint--);
+                               res = PQexec(obj->intern->conn->intern->conn, cmd);
+
+                               if (res) {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+
+                               efree(cmd);
+                       } else {
+                               res = PQexec(obj->intern->conn->intern->conn, "COMMIT");
+
+                               if (res) {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to commit transaction (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_commit_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, commitAsync) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       obj->intern->conn->intern->poller = PQconsumeInput;
+
+                       if (obj->intern->savepoint) {
+                               char *cmd;
+
+                               spprintf(&cmd, 0, "RELEASE SAVEPOINT \"%u\"", obj->intern->savepoint--);
+                               if (!PQsendQuery(obj->intern->conn->intern->conn, cmd)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+
+                               efree(cmd);
+                       } else {
+                               if (!PQsendQuery(obj->intern->conn->intern->conn, "COMMIT")) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to commit transaction (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_rollback, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, rollback) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       PGresult *res;
+
+                       if (obj->intern->savepoint) {
+                               char *cmd;
+
+                               spprintf(&cmd, 0, "ROLLBACK TO SAVEPOINT \"%u\"", obj->intern->savepoint--);
+                               res = PQexec(obj->intern->conn->intern->conn, cmd);
+
+                               if (res) {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+
+                               efree(cmd);
+                       } else {
+                               res = PQexec(obj->intern->conn->intern->conn, "ROLLBACK");
+
+                               if (res) {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to rollback transaction (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_rollback_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, rollbackAsync) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       obj->intern->conn->intern->poller = PQconsumeInput;
+
+                       if (obj->intern->savepoint) {
+                               char *cmd;
+
+                               spprintf(&cmd, 0, "ROLLBACK TO SAVEPOINT \"%u\"", obj->intern->savepoint--);
+                               if (!PQsendQuery(obj->intern->conn->intern->conn, cmd)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+
+                               efree(cmd);
+                       } else {
+                               if (!PQsendQuery(obj->intern->conn->intern->conn, "ROLLBACK")) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not rollback transaction (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_export_snapshot, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, exportSnapshot) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       PGresult *res = PQexec(obj->intern->conn->intern->conn, "SELECT pg_export_snapshot()");
+
+                       if (res) {
+                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       RETVAL_STRING(PQgetvalue(res, 0, 0), 1);
+                               }
+
+                               PHP_PQclear(res);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_export_snapshot_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, exportSnapshotAsync) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       obj->intern->conn->intern->poller = PQconsumeInput;
+
+                       if (!PQsendQuery(obj->intern->conn->intern->conn, "SELECT pg_export_snapshot()")) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to export transaction snapshot (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_import_snapshot, 0, 0, 1)
+       ZEND_ARG_INFO(0, snapshot_id)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, importSnapshot) {
+       zend_error_handling zeh;
+       char *snapshot_str;
+       int snapshot_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &snapshot_str, &snapshot_len)) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       if (obj->intern->isolation >= PHP_PQTXN_REPEATABLE_READ) {
+                               char *cmd, *sid = PQescapeLiteral(obj->intern->conn->intern->conn, snapshot_str, snapshot_len);
+                               PGresult *res;
+
+                               spprintf(&cmd, 0, "SET TRANSACTION SNAPSHOT %s", sid);
+                               res = PQexec(obj->intern->conn->intern->conn, cmd);
+
+                               if (res) {
+                                       php_pqres_success(res TSRMLS_CC);
+                                       PHP_PQclear(res);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_import_snapshot_async, 0, 0, 1)
+       ZEND_ARG_INFO(0, snapshot_id)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, importSnapshotAsync) {
+       zend_error_handling zeh;
+       char *snapshot_str;
+       int snapshot_len;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &snapshot_str, &snapshot_len)) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       if (obj->intern->isolation >= PHP_PQTXN_REPEATABLE_READ) {
+                               char *sid = PQescapeLiteral(obj->intern->conn->intern->conn, snapshot_str, snapshot_len);
+
+                               if (sid) {
+                                       char *cmd;
+                                       obj->intern->conn->intern->poller = PQconsumeInput;
+
+                                       spprintf(&cmd, 0, "SET TRANSACTION SNAPSHOT %s", sid);
+                                       if (!PQsendQuery(obj->intern->conn->intern->conn, cmd)) {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to %s (%s)", cmd, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       }
+                                       efree(cmd);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to quote snapshot identifier (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "A transaction must have at least isolation level REPEATABLE READ to be able to import a snapshot");
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_open_lob, 0, 0, 1)
+       ZEND_ARG_INFO(0, oid)
+       ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, openLOB) {
+       zend_error_handling zeh;
+       long mode = INV_WRITE|INV_READ, loid;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &loid, &mode)) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
+
+                       if (lofd >= 0) {
+                               php_pqlob_t *lob = ecalloc(1, sizeof(*lob));
+
+                               lob->lofd = lofd;
+                               lob->loid = loid;
+                               php_pq_object_addref(obj TSRMLS_CC);
+                               lob->txn = obj;
+
+                               return_value->type = IS_OBJECT;
+                               return_value->value.obj = php_pqlob_create_object_ex(php_pqlob_class_entry, lob, NULL TSRMLS_CC);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s' (%s)",
+                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
+                                                               (mode & INV_READ ? "r" :
+                                                                               (mode & INV_WRITE ? "w" : "-"))),
+                                               PHP_PQerrorMessage(obj->intern->conn->intern->conn)
+                               );
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_create_lob, 0, 0, 0)
+       ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, createLOB) {
+       zend_error_handling zeh;
+       long mode = INV_WRITE|INV_READ;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &mode)) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       Oid loid = lo_creat(obj->intern->conn->intern->conn, mode);
+
+                       if (loid != InvalidOid) {
+                               int lofd = lo_open(obj->intern->conn->intern->conn, loid, mode);
+
+                               if (lofd >= 0) {
+                                       php_pqlob_t *lob = ecalloc(1, sizeof(*lob));
+                                       lob->lofd = lofd;
+                                       lob->loid = loid;
+                                       php_pq_object_addref(obj TSRMLS_CC);
+                                       lob->txn = obj;
+
+                                       return_value->type = IS_OBJECT;
+                                       return_value->value.obj = php_pqlob_create_object_ex(php_pqlob_class_entry, lob, NULL TSRMLS_CC);
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s': %s",
+                                                       (mode & (INV_READ|INV_WRITE) ? "rw" :
+                                                                       (mode & INV_READ ? "r" :
+                                                                                       (mode & INV_WRITE ? "w" : "-"))),
+                                                       PHP_PQerrorMessage(obj->intern->conn->intern->conn)
+                                       );
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create large object with mode '%s': %s",
+                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
+                                                               (mode & INV_READ ? "r" :
+                                                                               (mode & INV_WRITE ? "w" : "-"))),
+                                               PHP_PQerrorMessage(obj->intern->conn->intern->conn)
+                               );
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqtxn_unlink_lob, 0, 0, 1)
+       ZEND_ARG_INFO(0, oid)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqtxn, unlinkLOB) {
+       long loid;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &loid)) {
+               php_pqtxn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       if (1 == lo_unlink(obj->intern->conn->intern->conn, loid)) {
+                               RETVAL_TRUE;
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to unlink LOB (oid=%ld): %s", loid, PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+static zend_function_entry php_pqtxn_methods[] = {
+       PHP_ME(pqtxn, __construct, ai_pqtxn_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqtxn, commit, ai_pqtxn_commit, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, rollback, ai_pqtxn_rollback, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, commitAsync, ai_pqtxn_commit_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, rollbackAsync, ai_pqtxn_rollback_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, savepoint, ai_pqtxn_savepoint, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, savepointAsync, ai_pqtxn_savepoint_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, exportSnapshot, ai_pqtxn_export_snapshot, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, exportSnapshotAsync, ai_pqtxn_export_snapshot_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, importSnapshot, ai_pqtxn_import_snapshot, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, importSnapshotAsync, ai_pqtxn_import_snapshot_async, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, openLOB, ai_pqtxn_open_lob, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, createLOB, ai_pqtxn_create_lob, ZEND_ACC_PUBLIC)
+       PHP_ME(pqtxn, unlinkLOB, ai_pqtxn_unlink_lob, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqcancel_construct, 0, 0, 1)
+       ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqcancel, __construct) {
+       zend_error_handling zeh;
+       zval *zconn;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zconn, php_pqconn_class_entry)) {
+               php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+
+               if (conn_obj->intern) {
+                       PGcancel *cancel = PQgetCancel(conn_obj->intern->conn);
+
+                       if (cancel) {
+                               php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+                               obj->intern = ecalloc(1, sizeof(*obj->intern));
+                               obj->intern->cancel = cancel;
+                               php_pq_object_addref(conn_obj TSRMLS_CC);
+                               obj->intern->conn = conn_obj;
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not acquire cancel (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqcancel_cancel, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqcancel, cancel) {
+       zend_error_handling zeh;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqcancel_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       char err[256];
+
+                       if (!PQcancel(obj->intern->cancel, err, sizeof(err))) {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not request cancellation: %s", err);
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Cancel not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+static zend_function_entry php_pqcancel_methods[] = {
+       PHP_ME(pqcancel, __construct, ai_pqcancel_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqcancel, cancel, ai_pqcancel_cancel, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+static void php_pqconn_add_eventhandler(zval *zconn, php_pqconn_object_t *conn_obj, const char *type_str, size_t type_len, zval *zevent TSRMLS_DC)
+{
+       zval **evhs;
+
+       if (SUCCESS == zend_hash_find(&conn_obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evhs)) {
+               Z_ADDREF_P(zevent);
+               add_next_index_zval(*evhs, zevent);
+       } else {
+               zval *evh;
+
+               MAKE_STD_ZVAL(evh);
+               array_init(evh);
+               Z_ADDREF_P(zevent);
+               add_next_index_zval(evh, zevent);
+               zend_hash_add(&conn_obj->intern->eventhandlers, type_str, type_len + 1, (void *) &evh, sizeof(zval *), NULL);
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqevent_construct, 0, 0, 3)
+       ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
+       ZEND_ARG_INFO(0, type)
+       ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqevent, __construct) {
+       zend_error_handling zeh;
+       zval *zconn;
+       char *type_str;
+       int type_len;
+       php_pq_callback_t cb;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osf", &zconn, php_pqconn_class_entry, &type_str, &type_len, &cb.fci, &cb.fcc)) {
+               php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
+
+               if (conn_obj->intern) {
+                       php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+                       obj->intern = ecalloc(1, sizeof(*obj->intern));
+                       php_pq_callback_addref(&cb);
+                       obj->intern->cb = cb;
+                       php_pq_object_addref(conn_obj TSRMLS_CC);
+                       obj->intern->conn = conn_obj;
+                       obj->intern->type = estrdup(type_str);
+
+                       php_pqconn_add_eventhandler(zconn, conn_obj, type_str, type_len, getThis() TSRMLS_CC);
+
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqevent_trigger, 0, 0, 1)
+       ZEND_ARG_ARRAY_INFO(0, args, 1)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqevent, trigger) {
+       zval *args;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &args)) {
+               php_pqevent_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       zval *rv = NULL;
+
+                       if (SUCCESS == zend_fcall_info_call(&obj->intern->cb.fci, &obj->intern->cb.fcc, &rv, args TSRMLS_CC)) {
+                               if (rv) {
+                                       RETVAL_ZVAL(rv, 0, 1);
+                               } else {
+                                       RETVAL_TRUE;
+                               }
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Event not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+static zend_function_entry php_pqevent_methods[] = {
+       PHP_ME(pqevent, __construct, ai_pqevent_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqevent, trigger, ai_pqevent_trigger, ZEND_ACC_PUBLIC)
+       {0}
+};
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_construct, 0, 0, 1)
+       ZEND_ARG_OBJ_INFO(0, transaction, pq\\Transaction, 0)
+       ZEND_ARG_INFO(0, oid)
+       ZEND_ARG_INFO(0, mode)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqlob, __construct) {
+       zend_error_handling zeh;
+       zval *ztxn;
+       long mode = INV_WRITE|INV_READ, loid = InvalidOid;
+
+       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|ll", &ztxn, php_pqtxn_class_entry, &loid, &mode)) {
+               php_pqtxn_object_t *txn_obj = zend_object_store_get_object(ztxn TSRMLS_CC);
+
+               if (txn_obj->intern) {
+
+                       if (loid == InvalidOid) {
+                               loid = lo_creat(txn_obj->intern->conn->intern->conn, mode);
+                       }
+
+                       if (loid != InvalidOid) {
+                               int lofd = lo_open(txn_obj->intern->conn->intern->conn, loid, mode);
+
+                               if (lofd >= 0) {
+                                       php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+                                       obj->intern = ecalloc(1, sizeof(*obj->intern));
+                                       obj->intern->lofd = lofd;
+                                       obj->intern->loid = loid;
+                                       php_pq_object_addref(txn_obj TSRMLS_CC);
+                                       obj->intern->txn = txn_obj;
+                               } else {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to open large object with mode '%s' (%s)",
+                                                       (mode & (INV_READ|INV_WRITE) ? "rw" :
+                                                                       (mode & INV_READ ? "r" :
+                                                                                       (mode & INV_WRITE ? "w" : "-"))),
+                                                       PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn)
+                                       );
+                               }
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to create large object with mode '%s' (%s)",
+                                               (mode & (INV_READ|INV_WRITE) ? "rw" :
+                                                               (mode & INV_READ ? "r" :
+                                                                               (mode & INV_WRITE ? "w" : "-"))),
+                                               PHP_PQerrorMessage(txn_obj->intern->conn->intern->conn)
+                               );
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Transaction not initialized");
+               }
+       }
+       zend_restore_error_handling(&zeh TSRMLS_CC);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_write, 0, 0, 1)
+       ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqlob, write) {
+       char *data_str;
+       int data_len;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) {
+               php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       int written = lo_write(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, data_str, data_len);
+
+                       if (written >= 0) {
+                               RETVAL_LONG(written);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to write to LOB, oid=%d (%s)", obj->intern->loid,
+                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
+                       RETVAL_FALSE;
+               }
+       }
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_read, 0, 0, 0)
+       ZEND_ARG_INFO(0, length)
+       ZEND_ARG_INFO(1, read)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqlob, read) {
+       long length = 0x1000;
+       zval *zread = NULL;
+
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lz!", &length, &zread)) {
+               php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       char *buffer = emalloc(length + 1);
+                       int read = lo_read(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, buffer, length);
+
+                       if (read >= 0) {
+                               if (zread) {
+                                       zval_dtor(zread);
+                                       ZVAL_LONG(zread, read);
+                               }
+                               buffer[read] = '\0';
+                               RETVAL_STRINGL(buffer, read, 0);
+                       } else {
+                               efree(buffer);
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to read from LOB, oid=%d (%s)", obj->intern->loid,
+                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                               RETVAL_FALSE;
+                       }
 
-       return row ? row : NULL;
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
+                       RETVAL_FALSE;
+               }
+       }
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_row, 0, 0, 0)
-       ZEND_ARG_INFO(0, fetch_type)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_seek, 0, 0, 1)
+       ZEND_ARG_INFO(0, offset)
+       ZEND_ARG_INFO(0, whence)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqres, fetchRow) {
-       zend_error_handling zeh;
-       php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-       long fetch_type = obj->iter ? obj->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+static PHP_METHOD(pqlob, seek) {
+       long offset, whence = SEEK_SET;
 
-       zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_type)) {
-               zval **row = php_pqres_iteration(getThis(), obj, fetch_type TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &offset, &whence)) {
+               php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+               if (obj->intern) {
+                       int position = lo_lseek(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, offset, whence);
 
-               if (row) {
-                       RETVAL_ZVAL(*row, 1, 0);
+                       if (position >= 0) {
+                               RETVAL_LONG(position);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek offset in LOB, oid=%d (%s)", obj->intern->loid,
+                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                               RETVAL_FALSE;
+                       }
                } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
                        RETVAL_FALSE;
                }
        }
-       zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-static zval **column_at(zval *row, int col TSRMLS_DC)
-{
-       zval **data = NULL;
-       HashTable *ht = HASH_OF(row);
-       int count = zend_hash_num_elements(ht);
+ZEND_BEGIN_ARG_INFO_EX(ai_pqlob_tell, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqlob, tell) {
+       if (SUCCESS == zend_parse_parameters_none()) {
+               php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-       if (col < count) {
-               zend_hash_internal_pointer_reset(ht);
-               while (col-- > 0) {
-                       zend_hash_move_forward(ht);
+               if (obj->intern) {
+                       int position = lo_tell(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd);
+
+                       if (position >= 0) {
+                               RETVAL_LONG(position);
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to tell offset in LOB (oid=%d): %s", obj->intern->loid,
+                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
+                               RETVAL_FALSE;
+                       }
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
+                       RETVAL_FALSE;
                }
-               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_BEGIN_ARG_INFO_EX(ai_pqlob_truncate, 0, 0, 0)
+       ZEND_ARG_INFO(0, length)
 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);
+static PHP_METHOD(pqlob, truncate) {
+       long length = 0;
 
-               if (row) {
-                       zval **col = column_at(*row, fetch_col TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &length)) {
+               php_pqlob_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-                       if (col) {
-                               RETVAL_ZVAL(*col, 1, 0);
+               if (obj->intern) {
+                       if (0 == lo_truncate(obj->intern->txn->intern->conn->intern->conn, obj->intern->lofd, length)) {
+                               RETVAL_TRUE;
                        } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to truncate LOB (oid=%d): %s", obj->intern->loid,
+                                               PHP_PQerrorMessage(obj->intern->txn->intern->conn->intern->conn));
                                RETVAL_FALSE;
                        }
                } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\LOB not initialized");
                        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)
+static zend_function_entry php_pqlob_methods[] = {
+       PHP_ME(pqlob, __construct, ai_pqlob_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqlob, write, ai_pqlob_write, ZEND_ACC_PUBLIC)
+       PHP_ME(pqlob, read, ai_pqlob_read, ZEND_ACC_PUBLIC)
+       PHP_ME(pqlob, seek, ai_pqlob_seek, ZEND_ACC_PUBLIC)
+       PHP_ME(pqlob, tell, ai_pqlob_tell, ZEND_ACC_PUBLIC)
+       PHP_ME(pqlob, truncate, ai_pqlob_truncate, 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_BEGIN_ARG_INFO_EX(ai_pqcopy_construct, 0, 0, 3)
+       ZEND_ARG_OBJ_INFO(0, "connection", pq\\Connection, 0)
+       ZEND_ARG_INFO(0, expression)
+       ZEND_ARG_INFO(0, direction)
+       ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqstm, __construct) {
+static PHP_METHOD(pqcopy, __construct) {
        zend_error_handling zeh;
-       zval *zconn, *ztypes = NULL;
-       char *name_str, *query_str;
-       int name_len, *query_len;
-       zend_bool async = 0;
+       zval *zconn;
+       char *expr_str, *opt_str = "";
+       int expr_len, opt_len = 0;
+       long direction;
 
        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);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Osl|s", &zconn, php_pqconn_class_entry, &expr_str, &expr_len, &direction, &opt_str, &opt_len)) {
                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);
+               if (conn_obj->intern) {
+                       char *copy = NULL;
+
+                       switch (direction) {
+                       case PHP_PQCOPY_FROM_STDIN:
+                               spprintf(&copy, 0, "COPY %s %s %s", expr_str, "FROM STDIN", opt_str);
+                               break;
+
+                       case PHP_PQCOPY_TO_STDOUT:
+                               spprintf(&copy, 0, "COPY %s %s %s", expr_str, "TO STDOUT", opt_str);
+                               break;
+
+                       default:
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid COPY direction, expected one of FROM_STDIN (%d) TO_STDOUT (%d), got %ld",
+                                               PHP_PQCOPY_FROM_STDIN, PHP_PQCOPY_TO_STDOUT, direction);
+                               break;
+                       }
+
+                       if (copy) {
+                               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+                               PGresult *res = PQexec(conn_obj->intern->conn, copy);
+
+                               efree(copy);
+
+                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                       obj->intern = ecalloc(1, sizeof(*obj->intern));
+                                       obj->intern->direction = direction;
+                                       obj->intern->expression = estrdup(expr_str);
+                                       obj->intern->options = estrdup(opt_str);
+                                       obj->intern->conn = conn_obj;
+                                       php_pq_object_addref(conn_obj TSRMLS_CC);
                                }
-                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+
+                               PHP_PQclear(res);
                        }
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
@@ -1820,185 +4363,149 @@ static PHP_METHOD(pqstm, __construct) {
        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_BEGIN_ARG_INFO_EX(ai_pqcopy_put, 0, 0, 1)
+       ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqstm, exec) {
+static PHP_METHOD(pqcopy, put) {
        zend_error_handling zeh;
-       zval *zparams = NULL;
+       char *data_str;
+       int data_len;
 
        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);
-                               }
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_str, &data_len)) {
+               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() 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);
-                                       }
+               if (obj->intern) {
+                       if (PHP_PQCOPY_FROM_STDIN == obj->intern->direction) {
+                               if (1 == PQputCopyData(obj->intern->conn->intern->conn, data_str, data_len)) {
+                                       RETVAL_TRUE;
                                } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to send COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                }
                        } else {
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY was not initialized with FROM_STDIN");
                        }
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY 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_BEGIN_ARG_INFO_EX(ai_pqcopy_end, 0, 0, 0)
+       ZEND_ARG_INFO(0, error)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqstm, execAsync) {
+static PHP_METHOD(pqcopy, end) {
        zend_error_handling zeh;
-       zval *zparams = NULL;
-       php_pq_callback_t resolver;
+       char *error_str = NULL;
+       int error_len = 0;
 
        zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!f", &zparams, &resolver.fci, &resolver.fcc)) {
-               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
-
-               if (obj->conn && obj->name) {
-                       php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->conn TSRMLS_CC);
-
-                       if (conn_obj->conn) {
-                               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);
-                               }
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &error_str, &error_len)) {
+               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
-                               conn_obj->poller = PQconsumeInput;
+               if (obj->intern) {
+                       if (PHP_PQCOPY_FROM_STDIN == obj->intern->direction) {
+                               if (1 == PQputCopyEnd(obj->intern->conn->intern->conn, error_str)) {
+                                       PGresult *res = PQgetResult(obj->intern->conn->intern->conn);
 
-                               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));
+                                       if (res) {
+                                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                                       RETVAL_TRUE;
                                                }
+
+                                               PHP_PQclear(res);
+                                       } else {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                        }
-                                       RETVAL_TRUE;
                                } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not execute statement: %s", PQerrorMessage(conn_obj->conn));
-                                       RETVAL_FALSE;
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to end COPY (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
                                }
-
-                               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;
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY was not initialized with FROM_STDIN");
                        }
                } else {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Statement not initialized");
-                       RETVAL_FALSE;
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\COPY not initialized");
                }
        }
        zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqcopy_get, 0, 0, 1)
+       ZEND_ARG_INFO(1, data)
 ZEND_END_ARG_INFO();
-static PHP_METHOD(pqstm, desc) {
+static PHP_METHOD(pqcopy, get) {
        zend_error_handling zeh;
+       zval *zdata;
 
        zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-       if (SUCCESS == zend_parse_parameters_none()) {
-               php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata)) {
+               php_pqcopy_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+               char *buffer = NULL;
 
-               if (obj->conn && obj->name) {
-                       php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->conn TSRMLS_CC);
+               if (obj->intern) {
+                       if (PHP_PQCOPY_TO_STDOUT == obj->intern->direction) {
+                               PGresult *res;
+                               int bytes = PQgetCopyData(obj->intern->conn->intern->conn, &buffer, 0);
 
-                       if (conn_obj->conn) {
-                               PGresult *res = PQdescribePrepared(conn_obj->conn, obj->name);
+                               switch (bytes) {
+                               case -1:
+                                       res = PQgetResult(obj->intern->conn->intern->conn);
 
-                               php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+                                       if (res) {
+                                               if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
+                                                       RETVAL_FALSE;
+                                               }
 
-                               if (res) {
-                                       if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
-                                               int p, params;
+                                               PHP_PQclear(res);
+                                       } else {
+                                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY result (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       }
+                                       break;
 
-                                               array_init(return_value);
-                                               for (p = 0, params = PQnparams(res); p < params; ++p) {
-                                                       add_next_index_long(return_value, PQparamtype(res, p));
-                                               }
+                               case -2:
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to get COPY data (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+                                       break;
+
+                               default:
+                                       zval_dtor(zdata);
+                                       if (buffer) {
+                                               ZVAL_STRINGL(zdata, buffer, bytes, 1);
+                                       } else {
+                                               ZVAL_EMPTY_STRING(zdata);
                                        }
-                               } else {
-                                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(conn_obj->conn));
+                                       RETVAL_TRUE;
+                                       break;
+                               }
+
+                               if (buffer) {
+                                       PQfreemem(buffer);
                                }
-                       } 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 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)
+static zend_function_entry php_pqcopy_methods[] = {
+       PHP_ME(pqcopy, __construct, ai_pqcopy_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(pqcopy, put, ai_pqcopy_put, ZEND_ACC_PUBLIC)
+       PHP_ME(pqcopy, end, ai_pqcopy_end, ZEND_ACC_PUBLIC)
+       PHP_ME(pqcopy, get, ai_pqcopy_get, ZEND_ACC_PUBLIC)
        {0}
 };
 
 /* {{{ PHP_MINIT_FUNCTION
  */
-PHP_MINIT_FUNCTION(pq)
+static PHP_MINIT_FUNCTION(pq)
 {
        zend_class_entry ce = {0};
        php_pq_object_prophandler_t ph = {0};
 
-       zend_hash_init(&php_pqconn_object_prophandlers, 1, NULL, NULL, 1);
        INIT_NS_CLASS_ENTRY(ce, "pq", "Connection", php_pqconn_methods);
        php_pqconn_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
        php_pqconn_class_entry->create_object = php_pqconn_create_object;
+
        memcpy(&php_pqconn_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        php_pqconn_object_handlers.read_property = php_pq_object_read_prop;
        php_pqconn_object_handlers.write_property = php_pq_object_write_prop;
@@ -2006,6 +4513,8 @@ PHP_MINIT_FUNCTION(pq)
        php_pqconn_object_handlers.get_property_ptr_ptr = NULL;
        php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info;
 
+       zend_hash_init(&php_pqconn_object_prophandlers, 13, NULL, NULL, 1);
+
        zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqconn_object_read_status;
        zend_hash_add(&php_pqconn_object_prophandlers, "status", sizeof("status"), (void *) &ph, sizeof(ph), NULL);
@@ -2022,10 +4531,6 @@ PHP_MINIT_FUNCTION(pq)
        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);
@@ -2037,6 +4542,34 @@ PHP_MINIT_FUNCTION(pq)
        ph.write = NULL;
 
        zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("unbuffered"), 0, ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_unbuffered;
+       ph.write = php_pqconn_object_write_unbuffered;
+       zend_hash_add(&php_pqconn_object_prophandlers, "unbuffered", sizeof("unbuffered"), (void *) &ph, sizeof(ph), NULL);
+       ph.write = NULL;
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("db"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_db;
+       zend_hash_add(&php_pqconn_object_prophandlers, "db", sizeof("db"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("user"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_user;
+       zend_hash_add(&php_pqconn_object_prophandlers, "user", sizeof("user"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("pass"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_pass;
+       zend_hash_add(&php_pqconn_object_prophandlers, "pass", sizeof("pass"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("host"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_host;
+       zend_hash_add(&php_pqconn_object_prophandlers, "host", sizeof("host"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("port"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_port;
+       zend_hash_add(&php_pqconn_object_prophandlers, "port", sizeof("port"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("options"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqconn_object_read_options;
+       zend_hash_add(&php_pqconn_object_prophandlers, "options", sizeof("options"), (void *) &ph, sizeof(ph), NULL);
 
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD TSRMLS_CC);
@@ -2058,13 +4591,37 @@ PHP_MINIT_FUNCTION(pq)
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("POLLING_WRITING"), PGRES_POLLING_WRITING TSRMLS_CC);
        zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("POLLING_OK"), PGRES_POLLING_OK TSRMLS_CC);
 
-       zend_hash_init(&php_pqres_object_prophandlers, 1, NULL, NULL, 1);
+       zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("ASYNC"), 0x1 TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("PERSISTENT"), 0x2 TSRMLS_CC);
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "Types", php_pqtypes_methods);
+       php_pqtypes_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqtypes_class_entry->create_object = php_pqtypes_create_object;
+
+       memcpy(&php_pqtypes_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqtypes_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqtypes_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqtypes_object_handlers.clone_obj = NULL;
+       php_pqtypes_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqtypes_object_handlers.get_debug_info = php_pq_object_debug_info;
+       php_pqtypes_object_handlers.has_dimension = php_pqtypes_object_has_dimension;
+       php_pqtypes_object_handlers.read_dimension = php_pqtypes_object_read_dimension;
+       php_pqtypes_object_handlers.unset_dimension = NULL;
+       php_pqtypes_object_handlers.write_dimension = NULL;
+
+       zend_hash_init(&php_pqtypes_object_prophandlers, 1, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqtypes_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqtypes_object_read_connection;
+       zend_hash_add(&php_pqtypes_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "pq", "Result", php_pqres_methods);
        php_pqres_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
        php_pqres_class_entry->create_object = php_pqres_create_object;
        php_pqres_class_entry->iterator_funcs.funcs = &php_pqres_iterator_funcs;
        php_pqres_class_entry->get_iterator = php_pqres_iterator_init;
+       zend_class_implements(php_pqres_class_entry TSRMLS_CC, 2, zend_ce_traversable, spl_ce_Countable);
 
        memcpy(&php_pqres_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
        php_pqres_object_handlers.read_property = php_pq_object_read_prop;
@@ -2072,6 +4629,9 @@ PHP_MINIT_FUNCTION(pq)
        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;
+       php_pqres_object_handlers.count_elements = php_pqres_count_elements;
+
+       zend_hash_init(&php_pqres_object_prophandlers, 6, NULL, NULL, 1);
 
        zend_declare_property_null(php_pqres_class_entry, ZEND_STRL("status"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqres_object_read_status;
@@ -2114,7 +4674,6 @@ PHP_MINIT_FUNCTION(pq)
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_ASSOC"), PHP_PQRES_FETCH_ASSOC TSRMLS_CC);
        zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_OBJECT"), PHP_PQRES_FETCH_OBJECT TSRMLS_CC);
 
-       zend_hash_init(&php_pqstm_object_prophandlers, 1, NULL, NULL, 1);
        memset(&ce, 0, sizeof(ce));
        INIT_NS_CLASS_ENTRY(ce, "pq", "Statement", php_pqstm_methods);
        php_pqstm_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
@@ -2127,6 +4686,8 @@ PHP_MINIT_FUNCTION(pq)
        php_pqstm_object_handlers.get_property_ptr_ptr = NULL;
        php_pqstm_object_handlers.get_debug_info = php_pq_object_debug_info;
 
+       zend_hash_init(&php_pqstm_object_prophandlers, 2, NULL, NULL, 1);
+
        zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("name"), ZEND_ACC_PUBLIC TSRMLS_CC);
        ph.read = php_pqstm_object_read_name;
        zend_hash_add(&php_pqstm_object_prophandlers, "name", sizeof("name"), (void *) &ph, sizeof(ph), NULL);
@@ -2135,6 +4696,150 @@ PHP_MINIT_FUNCTION(pq)
        ph.read = php_pqstm_object_read_connection;
        zend_hash_add(&php_pqstm_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
 
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "Transaction", php_pqtxn_methods);
+       php_pqtxn_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqtxn_class_entry->create_object = php_pqtxn_create_object;
+
+       memcpy(&php_pqtxn_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqtxn_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqtxn_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqtxn_object_handlers.clone_obj = NULL;
+       php_pqtxn_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqtxn_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_hash_init(&php_pqtxn_object_prophandlers, 4, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqtxn_object_read_connection;
+       zend_hash_add(&php_pqtxn_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("isolation"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqtxn_object_read_isolation;
+       ph.write = php_pqtxn_object_write_isolation;
+       zend_hash_add(&php_pqtxn_object_prophandlers, "isolation", sizeof("isolation"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("readonly"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqtxn_object_read_readonly;
+       ph.write = php_pqtxn_object_write_readonly;
+       zend_hash_add(&php_pqtxn_object_prophandlers, "readonly", sizeof("readonly"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqtxn_class_entry, ZEND_STRL("deferrable"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqtxn_object_read_deferrable;
+       ph.write = php_pqtxn_object_write_deferrable;
+       zend_hash_add(&php_pqtxn_object_prophandlers, "deferrable", sizeof("deferrable"), (void *) &ph, sizeof(ph), NULL);
+       ph.write = NULL;
+
+       zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("READ_COMMITTED"), PHP_PQTXN_READ_COMMITTED TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("REPEATABLE READ"), PHP_PQTXN_REPEATABLE_READ TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqtxn_class_entry, ZEND_STRL("SERIALIZABLE"), PHP_PQTXN_SERIALIZABLE TSRMLS_CC);
+
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "Cancel", php_pqcancel_methods);
+       php_pqcancel_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqcancel_class_entry->create_object = php_pqcancel_create_object;
+
+       memcpy(&php_pqcancel_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqcancel_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqcancel_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqcancel_object_handlers.clone_obj = NULL;
+       php_pqcancel_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqcancel_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_hash_init(&php_pqcancel_object_prophandlers, 1, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqcancel_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqcancel_object_read_connection;
+       zend_hash_add(&php_pqcancel_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "Event", php_pqevent_methods);
+       php_pqevent_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqevent_class_entry->create_object = php_pqevent_create_object;
+
+       memcpy(&php_pqevent_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqevent_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqevent_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqevent_object_handlers.clone_obj = NULL;
+       php_pqevent_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqevent_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_hash_init(&php_pqevent_object_prophandlers, 2, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqevent_object_read_connection;
+       zend_hash_add(&php_pqevent_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqevent_class_entry, ZEND_STRL("type"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqevent_object_read_type;
+       zend_hash_add(&php_pqevent_object_prophandlers, "type", sizeof("type"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("NOTICE"), ZEND_STRL("notice") TSRMLS_CC);
+       zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("RESULT"), ZEND_STRL("result") TSRMLS_CC);
+       zend_declare_class_constant_stringl(php_pqevent_class_entry, ZEND_STRL("RESET"), ZEND_STRL("reset") TSRMLS_CC);
+
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "LOB", php_pqlob_methods);
+       php_pqlob_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqlob_class_entry->create_object = php_pqlob_create_object;
+
+       memcpy(&php_pqlob_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqlob_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqlob_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqlob_object_handlers.clone_obj = NULL;
+       php_pqlob_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqlob_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_hash_init(&php_pqlob_object_prophandlers, 2, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqlob_class_entry, ZEND_STRL("transaction"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqlob_object_read_transaction;
+       zend_hash_add(&php_pqlob_object_prophandlers, "transaction", sizeof("transaction"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_long(php_pqlob_class_entry, ZEND_STRL("oid"), InvalidOid, ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqlob_object_read_oid;
+       zend_hash_add(&php_pqlob_object_prophandlers, "oid", sizeof("oid"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_class_constant_long(php_pqlob_class_entry, ZEND_STRL("INVALID_OID"), InvalidOid TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqlob_class_entry, ZEND_STRL("R"), INV_READ TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqlob_class_entry, ZEND_STRL("W"), INV_WRITE TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqlob_class_entry, ZEND_STRL("RW"), INV_READ|INV_WRITE TSRMLS_CC);
+
+       memset(&ce, 0, sizeof(ce));
+       INIT_NS_CLASS_ENTRY(ce, "pq", "COPY", php_pqcopy_methods);
+       php_pqcopy_class_entry = zend_register_internal_class_ex(&ce, NULL, NULL TSRMLS_CC);
+       php_pqcopy_class_entry->create_object = php_pqcopy_create_object;
+
+       memcpy(&php_pqcopy_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+       php_pqcopy_object_handlers.read_property = php_pq_object_read_prop;
+       php_pqcopy_object_handlers.write_property = php_pq_object_write_prop;
+       php_pqcopy_object_handlers.clone_obj = NULL;
+       php_pqcopy_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqcopy_object_handlers.get_debug_info = php_pq_object_debug_info;
+
+       zend_hash_init(&php_pqcopy_object_prophandlers, 4, NULL, NULL, 1);
+
+       zend_declare_property_null(php_pqcopy_class_entry, ZEND_STRL("connection"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqcopy_object_read_connection;
+       zend_hash_add(&php_pqcopy_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqcopy_class_entry, ZEND_STRL("expression"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqcopy_object_read_expression;
+       zend_hash_add(&php_pqcopy_object_prophandlers, "expression", sizeof("expression"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqcopy_class_entry, ZEND_STRL("direction"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqcopy_object_read_direction;
+       zend_hash_add(&php_pqcopy_object_prophandlers, "direction", sizeof("direction"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqcopy_class_entry, ZEND_STRL("options"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqcopy_object_read_options;
+       zend_hash_add(&php_pqcopy_object_prophandlers, "options", sizeof("options"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_class_constant_long(php_pqcopy_class_entry, ZEND_STRL("FROM_STDIN"), PHP_PQCOPY_FROM_STDIN TSRMLS_CC);
+       zend_declare_class_constant_long(php_pqcopy_class_entry, ZEND_STRL("TO_STDOUT"), PHP_PQCOPY_TO_STDOUT TSRMLS_CC);
+
+       php_persistent_handle_provide(ZEND_STRL("pq\\Connection"), &php_pqconn_resource_factory_ops, NULL, NULL);
+
        /*
        REGISTER_INI_ENTRIES();
        */
@@ -2144,21 +4849,37 @@ PHP_MINIT_FUNCTION(pq)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
-PHP_MSHUTDOWN_FUNCTION(pq)
+static PHP_MSHUTDOWN_FUNCTION(pq)
 {
        /* uncomment this line if you have INI entries
        UNREGISTER_INI_ENTRIES();
        */
+       php_persistent_handle_cleanup(ZEND_STRL("pq\\Connection"), NULL, 0 TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(pq)
+static PHP_MINFO_FUNCTION(pq)
 {
+#ifdef HAVE_PQLIBVERSION
+       int libpq_v;
+#endif
+       char libpq_version[10] = "pre-9.1";
+
        php_info_print_table_start();
-       php_info_print_table_header(2, "pq support", "enabled");
+       php_info_print_table_header(2, "PQ Support", "enabled");
+       php_info_print_table_row(2, "Extension Version", PHP_PQ_EXT_VERSION);
+       php_info_print_table_end();
+
+       php_info_print_table_start();
+       php_info_print_table_header(2, "Used Library", "Version");
+#ifdef HAVE_PQLIBVERSION
+       libpq_v = PQlibVersion();
+       slprintf(libpq_version, sizeof(libpq_version), "%d.%d.%d", libpq_v/10000%100, libpq_v/100%100, libpq_v%100);
+#endif
+       php_info_print_table_row(2, "libpq", libpq_version);
        php_info_print_table_end();
 
        /* Remove comments if you have entries in php.ini
@@ -2167,6 +4888,36 @@ PHP_MINFO_FUNCTION(pq)
 }
 /* }}} */
 
+const zend_function_entry pq_functions[] = {
+       {0}
+};
+
+static zend_module_dep pq_module_deps[] = {
+       ZEND_MOD_REQUIRED("raphf")
+       ZEND_MOD_END
+};
+
+/* {{{ pq_module_entry
+ */
+zend_module_entry pq_module_entry = {
+       STANDARD_MODULE_HEADER_EX,
+       NULL,
+       pq_module_deps,
+       "pq",
+       pq_functions,
+       PHP_MINIT(pq),
+       PHP_MSHUTDOWN(pq),
+       NULL,/*PHP_RINIT(pq),*/
+       NULL,/*PHP_RSHUTDOWN(pq),*/
+       PHP_MINFO(pq),
+       PHP_PQ_EXT_VERSION,
+       STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
+#ifdef COMPILE_DL_PQ
+ZEND_GET_MODULE(pq)
+#endif
 
 
 /*