X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=eb1ca97cdae75a4d3ef8df9e68f2063bb2dba604;hp=10defedd4c70cfc313dc345fcdb9169d23fdbf91;hb=c753ebfed3a4b21409cfa46212fd2c55227c809f;hpb=cb69b6218d9d6e789527b3bd62c3cc37686547a3

diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c
index 10defed..eb1ca97 100644
--- a/src/php_pq_misc.c
+++ b/src/php_pq_misc.c
@@ -24,10 +24,61 @@
 
 #include "php_pq.h"
 #include "php_pqexc.h"
+#include "php_pqconn_event.h"
 #include "php_pq_misc.h"
 #undef PHP_PQ_TYPE
 #include "php_pq_type.h"
 
+
+/* clear result object associated with a result handle */
+void php_pqres_clear(PGresult *r) {
+	php_pq_object_t *o = PQresultInstanceData(r, php_pqconn_event);
+
+	if (o) {
+		php_pq_object_delref(o);
+	} else {
+		PQclear(r);
+	}
+}
+
+/* clear any asynchronous results */
+void php_pqconn_clear(PGconn *conn) {
+	PGresult *r;
+	php_pqconn_event_data_t *evdata = PQinstanceData(conn, php_pqconn_event);
+
+	while ((r = PQgetResult(conn))) {
+		php_pqres_clear(r);
+	}
+
+	if (evdata && evdata->obj) {
+		if (php_pq_callback_is_enabled(&evdata->obj->intern->onevent)) {
+			if (php_pq_callback_is_locked(&evdata->obj->intern->onevent)) {
+				php_pq_callback_disable(&evdata->obj->intern->onevent);
+			} else {
+				php_pq_callback_dtor(&evdata->obj->intern->onevent);
+			}
+		}
+	}
+}
+
+/* safe wrappers to clear any asynchronous wrappers before querying synchronously */
+PGresult *php_pq_exec(PGconn *conn, const char *query) {
+	php_pqconn_clear(conn);
+	return PQexec(conn, query);
+}
+PGresult *php_pq_exec_params(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) {
+	php_pqconn_clear(conn);
+	return PQexecParams(conn, command, nParams, paramTypes, paramValues, paramLengths, paramFormats, resultFormat);
+}
+PGresult *php_pq_prepare(PGconn *conn, const char *stmtName, const char *query, int nParams, const Oid *paramTypes) {
+	php_pqconn_clear(conn);
+	return PQprepare(conn, stmtName, query, nParams, paramTypes);
+}
+PGresult *php_pq_exec_prepared(PGconn *conn, const char *stmtName, int nParams, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) {
+	php_pqconn_clear(conn);
+	return PQexecPrepared(conn, stmtName, nParams, paramValues, paramLengths, paramFormats, resultFormat);
+}
+
 char *php_pq_rtrim(char *e)
 {
 	size_t l = strlen(e);
@@ -370,7 +421,7 @@ static ZEND_RESULT_CODE parse_array(ArrayParserState *a)
 	return SUCCESS;
 }
 
-HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ TSRMLS_DC)
+HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ)
 {
 	HashTable *ht = NULL;
 	ArrayParserState a = {0};