X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=ad1a0a986ae66699c87ac6f13c8f6ed6ec466a03;hb=a06db6d217fc8ba0fd9b8273a9e595477d59afcc;hp=47d06701dbb66e620d51fa539a1d34661ee21e8c;hpb=cffcf8e687650733164a8baa53d04dea98ee6ca7;p=m6w6%2Fext-pq

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 47d0670..ad1a0a9 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -563,7 +563,7 @@ php_resource_factory_ops_t *php_pqconn_get_resource_factory_ops(void)
 static void php_pqconn_wakeup(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC)
 {
 	PGresult *res = PQexec(*handle, "");
-	PHP_PQclear(res);
+	php_pq_clear_res(res);
 
 	if (CONNECTION_OK != PQstatus(*handle)) {
 		PQreset(*handle);
@@ -597,7 +597,7 @@ static int apply_unlisten(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_k
 	PGresult *res = unlisten(obj->intern->conn, key->arKey, key->nKeyLength - 1 TSRMLS_CC);
 
 	if (res) {
-		PHP_PQclear(res);
+		php_pq_clear_res(res);
 	}
 
 	return ZEND_HASH_APPLY_REMOVE;
@@ -624,7 +624,7 @@ static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle
 	}
 	/* clean up async results */
 	while ((res = PQgetResult(*handle))) {
-		PHP_PQclear(res);
+		php_pq_clear_res(res);
 	}
 
 	/* clean up transaction & session */
@@ -638,7 +638,7 @@ static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle
 	}
 
 	if (res) {
-		PHP_PQclear(res);
+		php_pq_clear_res(res);
 	}
 
 	if (evdata) {
@@ -684,7 +684,7 @@ static PHP_METHOD(pqconn, __construct) {
 
 			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);
+				php_persistent_handle_resource_factory_init(&obj->intern->factory, phf);
 			} else {
 				php_resource_factory_init(&obj->intern->factory, &php_pqconn_resource_factory_ops, NULL, NULL);
 			}
@@ -783,7 +783,7 @@ static PHP_METHOD(pqconn, unlisten)
 
 			if (res) {
 				php_pqres_success(res TSRMLS_CC);
-				PHP_PQclear(res);
+				php_pq_clear_res(res);
 			}
 		}
 	}
@@ -882,7 +882,7 @@ static PHP_METHOD(pqconn, listen) {
 				smart_str_appends(&cmd, quoted_channel);
 				smart_str_0(&cmd);
 
-				res = PQexec(obj->intern->conn, cmd.c);
+				res = php_pq_exec(obj->intern->conn, cmd.c);
 
 				smart_str_free(&cmd);
 				PQfreemem(quoted_channel);
@@ -894,7 +894,7 @@ static PHP_METHOD(pqconn, listen) {
 						obj->intern->poller = PQconsumeInput;
 						php_pqconn_add_listener(obj, channel_str, channel_len, &listener TSRMLS_CC);
 					}
-					PHP_PQclear(res);
+					php_pq_clear_res(res);
 				}
 
 				php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -979,7 +979,7 @@ static PHP_METHOD(pqconn, notify) {
 				throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to notify listeners (%s)", PHP_PQerrorMessage(obj->intern->conn));
 			} else {
 				php_pqres_success(res TSRMLS_CC);
-				PHP_PQclear(res);
+				php_pq_clear_res(res);
 			}
 
 			php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -1067,14 +1067,14 @@ static PHP_METHOD(pqconn, exec) {
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
-			PGresult *res = PQexec(obj->intern->conn, query_str);
+			PGresult *res = php_pq_exec(obj->intern->conn, query_str);
 
 			if (!res) {
 				throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
 			} else if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
 				php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
 			} else {
-				PHP_PQclear(res);
+				php_pq_clear_res(res);
 			}
 
 			php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -1181,7 +1181,7 @@ static PHP_METHOD(pqconn, execParams) {
 				if (SUCCESS == php_pqres_success(res TSRMLS_CC)) {
 					php_pq_object_to_zval_no_addref(PQresultInstanceData(res, php_pqconn_event), &return_value TSRMLS_CC);
 				} else {
-					PHP_PQclear(res);
+					php_pq_clear_res(res);
 				}
 
 				php_pqconn_notify_listeners(obj TSRMLS_CC);
@@ -1247,14 +1247,14 @@ ZEND_RESULT_CODE php_pqconn_prepare(zval *object, php_pqconn_object_t *obj, cons
 		obj = zend_object_store_get_object(object TSRMLS_CC);
 	}
 
-	res = PQprepare(obj->intern->conn, name, query, params->type.count, params->type.oids);
+	res = php_pq_prepare(obj->intern->conn, name, query, params->type.count, params->type.oids);
 
 	if (!res) {
 		rv = FAILURE;
 		throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
 	} else {
 		rv = php_pqres_success(res TSRMLS_CC);
-		PHP_PQclear(res);
+		php_pq_clear_res(res);
 		php_pqconn_notify_listeners(obj TSRMLS_CC);
 	}
 
@@ -1362,14 +1362,14 @@ ZEND_RESULT_CODE php_pqconn_declare(zval *object, php_pqconn_object_t *obj, cons
 		obj = zend_object_store_get_object(object TSRMLS_CC);
 	}
 
-	res = PQexec(obj->intern->conn, decl);
+	res = php_pq_exec(obj->intern->conn, decl);
 
 	if (!res) {
 		rv = FAILURE;
 		throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to declare cursor (%s)", PHP_PQerrorMessage(obj->intern->conn));
 	} else {
 		rv = php_pqres_success(res TSRMLS_CC);
-		PHP_PQclear(res);
+		php_pq_clear_res(res);
 		php_pqconn_notify_listeners(obj TSRMLS_CC);
 	}
 
@@ -1398,18 +1398,13 @@ static PHP_METHOD(pqconn, declare) {
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
-			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len);
+			int query_offset;
+			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len, &query_offset);
 
 			if (SUCCESS != php_pqconn_declare(getThis(), obj, decl TSRMLS_CC)) {
 				efree(decl);
 			} else {
-				php_pqcur_t *cur = ecalloc(1, sizeof(*cur));
-
-				php_pq_object_addref(obj TSRMLS_CC);
-				cur->conn = obj;
-				cur->open = 1;
-				cur->name = estrdup(name_str);
-				cur->decl = decl;
+				php_pqcur_t *cur = php_pqcur_init(obj, name_str, decl, query_offset, flags TSRMLS_CC);
 
 				return_value->type = IS_OBJECT;
 				return_value->value.obj = php_pqcur_create_object_ex(php_pqcur_class_entry, cur, NULL TSRMLS_CC);
@@ -1460,18 +1455,13 @@ static PHP_METHOD(pqconn, declareAsync) {
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
-			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len);
+			int query_offset;
+			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len, &query_offset);
 
 			if (SUCCESS != php_pqconn_declare_async(getThis(), obj, decl TSRMLS_CC)) {
 				efree(decl);
 			} else {
-				php_pqcur_t *cur = ecalloc(1, sizeof(*cur));
-
-				php_pq_object_addref(obj TSRMLS_CC);
-				cur->conn = obj;
-				cur->open = 1;
-				cur->name = estrdup(name_str);
-				cur->decl = decl;
+				php_pqcur_t *cur = php_pqcur_init(obj, name_str, decl, query_offset, flags TSRMLS_CC);
 
 				return_value->type = IS_OBJECT;
 				return_value->value.obj = php_pqcur_create_object_ex(php_pqcur_class_entry, cur, NULL TSRMLS_CC);
@@ -1610,13 +1600,13 @@ ZEND_RESULT_CODE php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *
 		smart_str_appends(&cmd, " DEFERRABLE");
 		smart_str_0(&cmd);
 
-		res = PQexec(conn_obj->intern->conn, cmd.c);
+		res = php_pq_exec(conn_obj->intern->conn, cmd.c);
 
 		if (!res) {
 			throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to start transaction (%s)", PHP_PQerrorMessage(conn_obj->intern->conn));
 		} else {
 			rv = php_pqres_success(res TSRMLS_CC);
-			PHP_PQclear(res);
+			php_pq_clear_res(res);
 			php_pqconn_notify_listeners(conn_obj TSRMLS_CC);
 		}