X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqcur.c;h=2df4f73f3b7dacf71724d40e125d527c169c2afe;hp=54d9c447548d553fe5261c6ee95dae261cd2f7b1;hb=ed63ffdb6068a001a65a9e0e892079f97594afed;hpb=7e123e705dfcfd74aad88ac569a80b32a97a5e64

diff --git a/src/php_pqcur.c b/src/php_pqcur.c
index 54d9c44..2df4f73 100644
--- a/src/php_pqcur.c
+++ b/src/php_pqcur.c
@@ -29,7 +29,7 @@ zend_class_entry *php_pqcur_class_entry;
 static zend_object_handlers php_pqcur_object_handlers;
 static HashTable php_pqcur_object_prophandlers;
 
-static void cur_close(php_pqcur_object_t *obj TSRMLS_DC)
+static void cur_close(php_pqcur_object_t *obj, zend_bool async, zend_bool silent TSRMLS_DC)
 {
 	if (obj->intern->open && obj->intern->conn->intern) {
 		PGresult *res;
@@ -39,11 +39,22 @@ static void cur_close(php_pqcur_object_t *obj TSRMLS_DC)
 		smart_str_appends(&cmd, obj->intern->name);
 		smart_str_0(&cmd);
 
-		if ((res = PQexec(obj->intern->conn->intern->conn, cmd.c))) {
-			PHP_PQclear(res);
+		if (async) {
+			if (PQsendQuery(obj->intern->conn->intern->conn, cmd.c)) {
+				obj->intern->conn->intern->poller = PQconsumeInput;
+				php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
+			} else if (!silent) {
+				throw_exce(EX_IO TSRMLS_CC, "Failed to close cursor (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+			}
+		} else {
+			if ((res = PQexec(obj->intern->conn->intern->conn, cmd.c))) {
+				PHP_PQclear(res);
+			} else if (!silent) {
+				throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to close cursor (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+			}
 		}
-		smart_str_free(&cmd);
 
+		smart_str_free(&cmd);
 		obj->intern->open = 0;
 	}
 }
@@ -143,7 +154,7 @@ static void php_pqcur_object_free(void *o TSRMLS_DC)
 	fprintf(stderr, "FREE cur(#%d) %p (conn: %p)\n", obj->zv.handle, obj, obj->intern->conn);
 #endif
 	if (obj->intern) {
-		cur_close(obj TSRMLS_CC);
+		cur_close(obj, 0, 1 TSRMLS_CC);
 		php_pq_object_delref(obj->intern->conn TSRMLS_CC);
 		efree(obj->intern->decl);
 		efree(obj->intern->name);
@@ -196,6 +207,13 @@ static void php_pqcur_object_read_connection(zval *object, void *o, zval *return
 	php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
+static void php_pqcur_object_read_flags(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+	php_pqcur_object_t *obj = o;
+
+	RETVAL_LONG(obj->intern->flags);
+}
+
 char *php_pqcur_declare_str(const char *name_str, size_t name_len, unsigned flags, const char *query_str, size_t query_len)
 {
 	size_t decl_len = name_len + query_len + sizeof("DECLARE  BINARY INSENSITIVE NO SCROLL CURSOR WITH HOLD FOR ");
@@ -261,6 +279,7 @@ static PHP_METHOD(pqcur, __construct) {
 				cur->open = 1;
 				cur->name = estrdup(name_str);
 				cur->decl = decl;
+				cur->flags = flags;
 				obj->intern = cur;
 			}
 		}
@@ -298,7 +317,29 @@ static PHP_METHOD(pqcur, close)
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Cursor not initialized");
 		} else {
-			cur_close(obj TSRMLS_CC);
+			cur_close(obj, 0, 0 TSRMLS_CC);
+		}
+	}
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqcur_closeAsync, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqcur, closeAsync)
+{
+	zend_error_handling zeh;
+	STATUS rv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+	rv = zend_parse_parameters_none();
+	zend_restore_error_handling(&zeh TSRMLS_CC);
+
+	if (rv == SUCCESS) {
+		php_pqcur_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		if (!obj->intern) {
+			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Cursor not initialized");
+		} else {
+			cur_close(obj, 1, 0 TSRMLS_CC);
 		}
 	}
 }
@@ -342,6 +383,7 @@ static zend_function_entry php_pqcur_methods[] = {
 	PHP_ME(pqcur, open, ai_pqcur_open, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, openAsync, ai_pqcur_open, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, close, ai_pqcur_close, ZEND_ACC_PUBLIC)
+	PHP_ME(pqcur, closeAsync, ai_pqcur_closeAsync, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, fetch, ai_pqcur_fetch, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, move, ai_pqcur_move, ZEND_ACC_PUBLIC)
 	PHP_ME(pqcur, fetchAsync, ai_pqcur_fetchAsync, ZEND_ACC_PUBLIC)
@@ -389,6 +431,10 @@ PHP_MINIT_FUNCTION(pqcur)
 	ph.read = php_pqcur_object_read_connection;
 	zend_hash_add(&php_pqcur_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
 
+	zend_declare_property_null(php_pqcur_class_entry, ZEND_STRL("flags"), ZEND_ACC_PUBLIC TSRMLS_CC);
+	ph.read = php_pqcur_object_read_flags;
+	zend_hash_add(&php_pqcur_object_prophandlers, "flags", sizeof("flags"), (void *) &ph, sizeof(ph), NULL);
+
 	return SUCCESS;
 }