X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq.c;h=47cde793c4b35f748ac799fff9af99cf2711e34d;hp=c716a6156e60dd1bf34d17f29eb16ba3602dd2ce;hb=fa1bffb85223f17773c81f3835ddcc8284ddc909;hpb=8c6b701bbd00db448d04be4a6a059641f299130d

diff --git a/src/php_pq.c b/src/php_pq.c
index c716a61..47cde79 100644
--- a/src/php_pq.c
+++ b/src/php_pq.c
@@ -1733,24 +1733,6 @@ typedef struct php_pqconn_resource_factory_data {
 	long flags;
 } php_pqconn_resource_factory_data_t;
 
-static php_pqconn_resource_factory_data_t *php_pqconn_resource_factory_data_init(const char *dsn, long flags)
-{
-	php_pqconn_resource_factory_data_t *data = emalloc(sizeof(*data));
-
-	data->dsn = estrdup(dsn);
-	data->flags = flags;
-
-	return data;
-}
-
-static void php_pqconn_resource_factory_data_dtor(void *d)
-{
-	php_pqconn_resource_factory_data_t *data = d;
-
-	efree(data->dsn);
-	efree(data);
-}
-
 static void *php_pqconn_resource_factory_ctor(void *data, void *init_arg TSRMLS_DC)
 {
 	php_pqconn_resource_factory_data_t *o = init_arg;
@@ -3464,12 +3446,49 @@ 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->conn && obj->name) {
+			php_pqconn_object_t *conn_obj = zend_object_store_get_object(obj->conn TSRMLS_CC);
+
+			if (conn_obj->conn) {
+				conn_obj->poller = PQconsumeInput;
+				if (PQsendDescribePrepared(conn_obj->conn, obj->name)) {
+					RETVAL_TRUE;
+				} else {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not describe statement: %s", PQerrorMessage(conn_obj->conn));
+					RETVAL_FALSE;
+				}
+
+				php_pqconn_notify_listeners(obj->conn, conn_obj TSRMLS_CC);
+
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Connection not initialized");
+				RETVAL_FALSE;
+			}
+		} 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}
 };