X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=d0ddfef9317c8036cc666f835dea8197c82bee63;hp=976e336a4bd9cf233ade70c77705fc51bf64e055;hb=65b81572a092cc9aa9b980f30f7793b45803a211;hpb=c753ebfed3a4b21409cfa46212fd2c55227c809f

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 976e336..d0ddfef 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -86,6 +86,7 @@ static void php_pqconn_object_free(zend_object *o)
 		php_resource_factory_handle_dtor(&obj->intern->factory, obj->intern->conn);
 		php_resource_factory_dtor(&obj->intern->factory);
 		zend_hash_destroy(&obj->intern->listeners);
+		zend_hash_destroy(&obj->intern->statements);
 		zend_hash_destroy(&obj->intern->converters);
 		zend_hash_destroy(&obj->intern->eventhandlers);
 		efree(obj->intern);
@@ -215,6 +216,20 @@ static void php_pqconn_object_write_unbuffered(zval *object, void *o, zval *valu
 	obj->intern->unbuffered = z_is_true(value);
 }
 
+static void php_pqconn_object_read_nonblocking(zval *object, void *o, zval *return_value)
+{
+	php_pqconn_object_t *obj = o;
+
+	RETVAL_BOOL(PQisnonblocking(obj->intern->conn));
+}
+
+static void php_pqconn_object_write_nonblocking(zval *object, void *o, zval *value)
+{
+	php_pqconn_object_t *obj = o;
+
+	PQsetnonblocking(obj->intern->conn, z_is_true(value));
+}
+
 static void php_pqconn_object_read_db(zval *object, void *o, zval *return_value)
 {
 	php_pqconn_object_t *obj = o;
@@ -668,6 +683,7 @@ static PHP_METHOD(pqconn, __construct) {
 			obj->intern->default_auto_convert = PHP_PQRES_CONV_ALL;
 
 			zend_hash_init(&obj->intern->listeners, 0, NULL, ZVAL_PTR_DTOR, 0);
+			zend_hash_init(&obj->intern->statements, 0, NULL, NULL, 0);
 			zend_hash_init(&obj->intern->converters, 0, NULL, ZVAL_PTR_DTOR, 0);
 			zend_hash_init(&obj->intern->eventhandlers, 0, NULL, ZVAL_PTR_DTOR, 0);
 
@@ -1045,6 +1061,40 @@ static PHP_METHOD(pqconn, poll) {
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_flush, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, flush) {
+	zend_error_handling zeh;
+	ZEND_RESULT_CODE rv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh);
+	rv = zend_parse_parameters_none();
+	zend_restore_error_handling(&zeh);
+
+	if (SUCCESS == rv) {
+		php_pqconn_object_t *obj = PHP_PQ_OBJ(getThis(), NULL);
+
+		if (!obj->intern) {
+			throw_exce(EX_UNINITIALIZED, "pq\\Connection not initialized");
+		} else if (!obj->intern->poller) {
+			throw_exce(EX_RUNTIME, "No asynchronous operation active");
+		} else {
+			switch (PQflush(obj->intern->conn)) {
+			case -1:
+			default:
+				throw_exce(EX_RUNTIME, "Failed to flush connection: %s", PHP_PQerrorMessage(obj->intern->conn));
+				break;
+			case 0:
+				RETVAL_TRUE;
+				break;
+			case 1:
+				RETVAL_FALSE;
+				break;
+			}
+		}
+	}
+}
+
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_exec, 0, 0, 1)
 	ZEND_ARG_INFO(0, query)
 ZEND_END_ARG_INFO();
@@ -1096,11 +1146,12 @@ static PHP_METHOD(pqconn, getResult) {
 			throw_exce(EX_UNINITIALIZED, "pq\\Connection not initialized");
 		} else {
 			PGresult *res = PQgetResult(obj->intern->conn);
+			php_pq_object_t *res_obj;
 
-			if (!res) {
-				RETVAL_NULL();
+			if (res && (res_obj = PQresultInstanceData(res, php_pqconn_event))) {
+				php_pq_object_to_zval_no_addref(res_obj, return_value);
 			} else {
-				php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), return_value);
+				RETVAL_NULL();
 			}
 
 			php_pqconn_notify_listeners(obj);
@@ -1900,6 +1951,7 @@ static zend_function_entry php_pqconn_methods[] = {
 	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, flush, ai_pqconn_flush, 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)
@@ -1957,7 +2009,7 @@ PHP_MINIT_FUNCTION(pqconn)
 	php_pqconn_object_handlers.get_properties = php_pq_object_properties;
 	php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info;
 
-	zend_hash_init(&php_pqconn_object_prophandlers, 22, NULL, php_pq_object_prophandler_dtor, 1);
+	zend_hash_init(&php_pqconn_object_prophandlers, 23, NULL, php_pq_object_prophandler_dtor, 1);
 
 	zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC);
 	ph.read = php_pqconn_object_read_status;
@@ -1991,6 +2043,12 @@ PHP_MINIT_FUNCTION(pqconn)
 	zend_hash_str_add_mem(&php_pqconn_object_prophandlers, "unbuffered", sizeof("unbuffered")-1, (void *) &ph, sizeof(ph));
 	ph.write = NULL;
 
+	zend_declare_property_bool(php_pqconn_class_entry, ZEND_STRL("nonblocking"), 0, ZEND_ACC_PUBLIC);
+	ph.read = php_pqconn_object_read_nonblocking;
+	ph.write = php_pqconn_object_write_nonblocking;
+	zend_hash_str_add_mem(&php_pqconn_object_prophandlers, "nonblocking", sizeof("nonblocking")-1, (void *) &ph, sizeof(ph));
+	ph.write = NULL;
+
 	zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("db"), ZEND_ACC_PUBLIC);
 	ph.read = php_pqconn_object_read_db;
 	zend_hash_str_add_mem(&php_pqconn_object_prophandlers, "db", sizeof("db")-1, (void *) &ph, sizeof(ph));