X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fphp_pq.c;h=6223ef95c74f90a47194102be28773dbe6be1006;hb=610b4a3a7a4a14a5bb0996f0f0871eb79e46b8e5;hp=ac68ca2f6e4a49bdd5e4d7f153779447e3cfc6a9;hpb=c7693a7707efa6c083a266b367c60d5f8adbce0e;p=m6w6%2Fext-pq

diff --git a/src/php_pq.c b/src/php_pq.c
index ac68ca2..6223ef9 100644
--- a/src/php_pq.c
+++ b/src/php_pq.c
@@ -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>                 |
     +--------------------------------------------------------------------+
 */
 
@@ -14,10 +14,14 @@
 #	include "config.h"
 #endif
 
+#define SMART_STR_PREALLOC 256
+
 #include <php.h>
 #include <Zend/zend_interfaces.h>
 #include <ext/standard/info.h>
+#include <ext/standard/php_smart_str.h>
 #include <ext/spl/spl_array.h>
+#include <ext/raphf/php_raphf.h>
 
 #include <libpq-events.h>
 #include <libpq/libpq-fs.h>
@@ -51,7 +55,6 @@ static int php_pqconn_event(PGEventId id, void *e, void *data);
 ZEND_DECLARE_MODULE_GLOBALS(pq)
 */
 
-
 /* {{{ PHP_INI
  */
 /* Remove comments and fill if you need to have entries in php.ini
@@ -106,9 +109,13 @@ typedef struct php_pq_object {
 	void *intern;
 } php_pq_object_t;
 
+#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;
@@ -522,7 +529,8 @@ static void php_pqconn_object_free(void *o TSRMLS_DC)
 	php_pqconn_object_t *obj = o;
 
 	if (obj->intern) {
-		PQfinish(obj->intern->conn);
+		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);
@@ -1571,6 +1579,7 @@ static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj
 	if ((CONNECTION_BAD != PQstatus(obj->intern->conn))
 	&&	(-1 < (socket = PQsocket(obj->intern->conn)))
 	&&	(stream = php_stream_fopen_from_fd(socket, "r+b", NULL))) {
+		stream->flags |= PHP_STREAM_FLAG_NO_CLOSE;
 		php_stream_to_zval(stream, zsocket);
 		retval = SUCCESS;
 	} else {
@@ -1591,17 +1600,6 @@ 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)
-{
-	PQsetInstanceData(event->conn, php_pqconn_event, data);
-}
-
-static void php_pqconn_event_conndestroy(PGEventConnDestroy *event, php_pqconn_event_data_t *data)
-{
-	PQsetInstanceData(event->conn, php_pqconn_event, NULL);
-	efree(data);
-}
-
 static int apply_event(void *p, void *a TSRMLS_DC)
 {
 	zval **evh = p;
@@ -1616,20 +1614,24 @@ static int apply_event(void *p, void *a TSRMLS_DC)
 	return ZEND_HASH_APPLY_KEEP;
 }
 
-static void php_pqconn_event_connreset(PGEventConnReset *event, php_pqconn_event_data_t *data)
+static void php_pqconn_event_connreset(PGEventConnReset *event)
 {
-	zval **evhs;
-	TSRMLS_DF(data);
+	php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
+
+	if (data) {
+		zval **evhs;
+		TSRMLS_DF(data);
 
-	if (SUCCESS == zend_hash_find(&data->obj->intern->eventhandlers, ZEND_STRS("reset"), (void *) &evhs)) {
-		zval *args, *connection = NULL;
+		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);
+			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);
+		}
 	}
 }
 
@@ -1653,48 +1655,46 @@ static zval *result_instance_zval(PGresult *res TSRMLS_DC)
 	return rid;
 }
 
-static void php_pqconn_event_resultcreate(PGEventResultCreate *event, php_pqconn_event_data_t *data)
+static void php_pqconn_event_resultcreate(PGEventResultCreate *event)
 {
-	zval **evhs;
-	TSRMLS_DF(data);
-
-	/* 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);
-	}
+	php_pqconn_event_data_t *data = PQinstanceData(event->conn, php_pqconn_event);
+
+	if (data) {
+		zval **evhs;
+		TSRMLS_DF(data);
+
+		/* 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);
+		}
 
-	/* async callback */
-	if (data->obj->intern->onevent.fci.size > 0) {
-		zval *res = result_instance_zval(event->result TSRMLS_CC);
+		/* 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->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);
+			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);
+		}
 	}
 }
 
 static int php_pqconn_event(PGEventId id, void *e, void *data)
 {
 	switch (id) {
-	case PGEVT_REGISTER:
-		php_pqconn_event_register(e, data);
-		break;
-	case PGEVT_CONNDESTROY:
-		php_pqconn_event_conndestroy(e, data);
-		break;
 	case PGEVT_CONNRESET:
-		php_pqconn_event_connreset(e, data);
+		php_pqconn_event_connreset(e);
 		break;
 	case PGEVT_RESULTCREATE:
-		php_pqconn_event_resultcreate(e, data);
+		php_pqconn_event_resultcreate(e);
 		break;
 	default:
 		break;
@@ -1716,19 +1716,134 @@ static php_pqconn_event_data_t *php_pqconn_event_data_init(php_pqconn_object_t *
 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;
+	if (data) {
+		zval **evhs;
+		TSRMLS_DF(data);
 
-		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);
+		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;
+	PGconn *conn = NULL;;
+
+	if (o->flags & PHP_PQCONN_ASYNC) {
+		conn = PQconnectStart(o->dsn);
+	} else {
+		conn = PQconnectdb(o->dsn);
+	}
+
+	if (conn) {
+		PQregisterEventProc(conn, php_pqconn_event, "ext-pq", NULL);
+	}
+
+	return conn;
+}
+
+static void php_pqconn_resource_factory_dtor(void *opaque, void *handle TSRMLS_DC)
+{
+	php_pqconn_event_data_t *evdata = PQinstanceData(handle, php_pqconn_event);
+
+	/* we don't care for anthing, except free'ing evdata */
+	if (evdata) {
+		PQsetInstanceData(handle, php_pqconn_event, NULL);
+		memset(evdata, 0, sizeof(*evdata));
+		efree(evdata);
+	}
+
+	PQfinish(handle);
+}
+
+static php_resource_factory_ops_t php_pqconn_resource_factory_ops = {
+	php_pqconn_resource_factory_ctor,
+	NULL,
+	php_pqconn_resource_factory_dtor
+};
+
+static void php_pqconn_wakeup(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC)
+{
+}
+
+static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+	php_pqconn_object_t *obj = va_arg(argv, php_pqconn_object_t *);
+	char *quoted_channel = PQescapeIdentifier(obj->intern->conn, key->arKey, key->nKeyLength - 1);
+
+	if (quoted_channel) {
+		PGresult *res;
+		char *cmd;
+
+		spprintf(&cmd, 0, "UNLISTEN %s", quoted_channel);
+		if ((res = PQexec(obj->intern->conn, cmd))) {
+			PHP_PQclear(res);
+		}
+
+		efree(cmd);
+		PQfreemem(quoted_channel);
+	}
+
+	return ZEND_HASH_APPLY_REMOVE;
+}
+
+static void php_pqconn_notice_ignore(void *p, const PGresult *res)
+{
+}
+
+static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC)
+{
+	php_pqconn_event_data_t *evdata = PQinstanceData(*handle, php_pqconn_event);
+	PGresult *res;
+
+	/* go away */
+	PQsetInstanceData(*handle, php_pqconn_event, NULL);
+
+	/* ignore notices */
+	PQsetNoticeReceiver(*handle, php_pqconn_notice_ignore, NULL);
+
+	/* clean up async results */
+	while ((res = PQgetResult(*handle))) {
+		PHP_PQclear(res);
+	}
+
+	/* clean up transaction & session */
+	switch (PQtransactionStatus(*handle)) {
+	case PQTRANS_IDLE:
+		res = PQexec(*handle, "RESET ALL");
+		break;
+	default:
+		res = PQexec(*handle, "ROLLBACK; RESET ALL");
+		break;
+	}
+
+	if (res) {
+		PHP_PQclear(res);
+	}
+
+	if (evdata) {
+		/* clean up notify listeners */
+		zend_hash_apply_with_arguments(&evdata->obj->intern->listeners TSRMLS_CC, apply_unlisten, 1, evdata->obj);
+
+		/* release instance data */
+		memset(evdata, 0, sizeof(*evdata));
+		efree(evdata);
 	}
 }
 
@@ -1740,28 +1855,34 @@ static PHP_METHOD(pqconn, __construct) {
 	zend_error_handling zeh;
 	char *dsn_str = "";
 	int dsn_len = 0;
-	zend_bool async = 0;
+	long flags = 0;
 
 	zend_replace_error_handling(EH_THROW, NULL, &zeh TSRMLS_CC);
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sb", &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));
 
 		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, php_pqconn_wakeup, php_pqconn_retire 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->intern->conn = PQconnectStart(dsn_str);
+		if (flags & PHP_PQCONN_ASYNC) {
 			obj->intern->poller = (int (*)(PGconn*)) PQconnectPoll;
-		} else {
-			obj->intern->conn = PQconnectdb(dsn_str);
 		}
 
-		PQsetNoticeReceiver(obj->intern->conn, php_pqconn_notice_recv, data);
-		PQregisterEventProc(obj->intern->conn, php_pqconn_event, "ext-pq", data);
+		obj->intern->conn = php_resource_factory_handle_ctor(&obj->intern->factory, &rfdata TSRMLS_CC);
+
+		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)", PHP_PQerrorMessage(obj->intern->conn));
@@ -1845,7 +1966,7 @@ static PHP_METHOD(pqconn, listen) {
 				PGresult *res;
 				char *cmd;
 
-				spprintf(&cmd, 0, "LISTEN %s", channel_str);
+				spprintf(&cmd, 0, "LISTEN %s", quoted_channel);
 				res = PQexec(obj->intern->conn, cmd);
 
 				efree(cmd);
@@ -1875,6 +1996,51 @@ static PHP_METHOD(pqconn, listen) {
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_listen_async, 0, 0, 0)
+	ZEND_ARG_INFO(0, channel)
+	ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, listenAsync) {
+	char *channel_str = NULL;
+	int channel_len = 0;
+	php_pq_callback_t listener;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sf", &channel_str, &channel_len, &listener.fci, &listener.fcc)) {
+		php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		obj->intern->poller = PQconsumeInput;
+
+		if (obj->intern) {
+			char *quoted_channel = PQescapeIdentifier(obj->intern->conn, channel_str, channel_len);
+
+			if (quoted_channel) {
+				char *cmd;
+
+				obj->intern->poller = PQconsumeInput;
+
+				spprintf(&cmd, 0, "LISTEN %s", channel_str);
+				if (PQsendQuery(obj->intern->conn, cmd)) {
+					php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
+					RETVAL_TRUE;
+				} else {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not install listener (%s)", PHP_PQerrorMessage(obj->intern->conn));
+					RETVAL_FALSE;
+				}
+
+				efree(cmd);
+				PQfreemem(quoted_channel);
+
+				php_pqconn_notify_listeners(obj TSRMLS_CC);
+			} else {
+				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");
+			RETVAL_FALSE;
+		}
+	}
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify, 0, 0, 2)
 	ZEND_ARG_INFO(0, channel)
 	ZEND_ARG_INFO(0, message)
@@ -1913,6 +2079,38 @@ static PHP_METHOD(pqconn, notify) {
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_notify_async, 0, 0, 2)
+	ZEND_ARG_INFO(0, channel)
+	ZEND_ARG_INFO(0, message)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, notifyAsync) {
+	char *channel_str, *message_str;
+	int channel_len, message_len;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &channel_str, &channel_len, &message_str, &message_len)) {
+		php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		if (obj->intern) {
+			char *params[2] = {channel_str, message_str};
+
+			obj->intern->poller = PQconsumeInput;
+
+			if (PQsendQueryParams(obj->intern->conn, "select pg_notify($1, $2)", 2, NULL, (const char *const*) params, NULL, NULL, 0)) {
+				RETVAL_TRUE;
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
+				RETVAL_FALSE;
+			}
+
+			php_pqconn_notify_listeners(obj TSRMLS_CC);
+
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "pq\\Connection not initialized");
+			RETVAL_FALSE;
+		}
+	}
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_poll, 0, 0, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, poll) {
@@ -2097,7 +2295,7 @@ static int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC)
 		Oid *tmp;
 
 		/* +1 for when less types than params are specified */
-		*types = tmp = ecalloc(count + 1, sizeof(Oid));
+		*types = tmp = ecalloc(count + 1, sizeof(**types));
 		zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC);
 	}
 	
@@ -2119,7 +2317,26 @@ static int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdto
 	
 	return count;
 }
+/*
+static Oid *php_pq_ntypes_to_array(zend_bool fill, int argc, ...)
+{
+	int i;
+	Oid *oids = ecalloc(argc + 1, sizeof(*oids));
+	va_list argv;
+
+	va_start(argv, argc);
+	for (i = 0; i < argc; ++i) {
+		if (!fill || !i) {
+			oids[i] = va_arg(argv, Oid);
+		} else {
+			oids[i] = oids[0];
+		}
+	}
+	va_end(argv);
 
+	return oids;
+}
+*/
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec_params, 0, 0, 2)
 	ZEND_ARG_INFO(0, query)
 	ZEND_ARG_ARRAY_INFO(0, params, 0)
@@ -2684,7 +2901,9 @@ static zend_function_entry php_pqconn_methods[] = {
 	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, listenAsync, ai_pqconn_listen_async, ZEND_ACC_PUBLIC)
 	PHP_ME(pqconn, notify, ai_pqconn_notify, ZEND_ACC_PUBLIC)
+	PHP_ME(pqconn, notifyAsync, ai_pqconn_notify_async, 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)
@@ -2698,13 +2917,14 @@ static zend_function_entry php_pqconn_methods[] = {
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_construct, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
+	ZEND_ARG_ARRAY_INFO(0, namespaces, 1)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtypes, __construct) {
 	zend_error_handling zeh;
-	zval *zconn;
+	zval *zconn, *znsp = NULL;
 
 	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)) {
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|a!", &zconn, php_pqconn_class_entry, &znsp)) {
 		php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
 
 		if (conn_obj->intern) {
@@ -2716,7 +2936,11 @@ static PHP_METHOD(pqtypes, __construct) {
 			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 (znsp) {
+				zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval, znsp);
+			} else {
+				zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "refresh", &retval);
+			}
 			if (retval) {
 				zval_ptr_dtor(&retval);
 			}
@@ -2731,17 +2955,52 @@ static PHP_METHOD(pqtypes, __construct) {
 	"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')"
+	"and typrelid=0"
+#define PHP_PQ_OID_TEXT 25
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqtypes_refresh, 0, 0, 0)
+	ZEND_ARG_ARRAY_INFO(0, namespaces, 1)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqtypes, refresh) {
-	if (SUCCESS == zend_parse_parameters_none()) {
+	HashTable *nsp = NULL;
+
+	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H/!", &nsp)) {
 		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);
+			PGresult *res;
+
+			if (nsp && zend_hash_num_elements(nsp)) {
+				int i, count;
+				Oid *oids;
+				char **params = NULL;
+				HashTable zdtor;
+				smart_str str = {0};
+
+				smart_str_appends(&str, PHP_PQ_TYPES_QUERY " and nspname in(");
+				zend_hash_init(&zdtor, 0, NULL, ZVAL_PTR_DTOR, 0);
+				count = php_pq_params_to_array(nsp, &params, &zdtor TSRMLS_CC);
+				oids = ecalloc(count + 1, sizeof(*oids));
+				for (i = 0; i < count; ++i) {
+					oids[i] = PHP_PQ_OID_TEXT;
+					if (i) {
+						smart_str_appendc(&str, ',');
+					}
+					smart_str_appendc(&str, '$');
+					smart_str_append_unsigned(&str, i+1);
+				}
+				smart_str_appendc(&str, ')');
+				smart_str_0(&str);
+
+				res = PQexecParams(obj->intern->conn->intern->conn, str.c, count, oids, (const char *const*) params, NULL, NULL, 0);
+
+				smart_str_free(&str);
+				efree(oids);
+				efree(params);
+				zend_hash_destroy(&zdtor);
+			} else {
+				res = PQexec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY " and nspname in ('public', 'pg_catalog')");
+			}
 
 			php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
 
@@ -3416,12 +3675,44 @@ static PHP_METHOD(pqstm, desc) {
 	zend_restore_error_handling(&zeh TSRMLS_CC);
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_desc_async, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqstm, descAsync) {
+	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) {
+
+			obj->intern->conn->intern->poller = PQconsumeInput;
+
+			if (PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
+				RETVAL_TRUE;
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+				RETVAL_FALSE;
+			}
+
+			php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
+
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Statement not initialized");
+			RETVAL_FALSE;
+		}
+	}
+	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)
+	PHP_ME(pqstm, descAsync, ai_pqstm_desc_async, ZEND_ACC_PUBLIC)
 	{0}
 };
 
@@ -4561,6 +4852,8 @@ static 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_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);
@@ -4806,6 +5099,8 @@ static PHP_MINIT_FUNCTION(pq)
 	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 TSRMLS_CC);
+
 	/*
 	REGISTER_INI_ENTRIES();
 	*/
@@ -4820,6 +5115,7 @@ 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;
 }
 /* }}} */
@@ -4857,10 +5153,18 @@ const zend_function_entry pq_functions[] = {
 	{0}
 };
 
+static zend_module_dep pq_module_deps[] = {
+	ZEND_MOD_REQUIRED("raphf")
+	ZEND_MOD_REQUIRED("spl")
+	ZEND_MOD_END
+};
+
 /* {{{ pq_module_entry
  */
 zend_module_entry pq_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	pq_module_deps,
 	"pq",
 	pq_functions,
 	PHP_MINIT(pq),