projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update tests
[m6w6/ext-pq]
/
src
/
php_pqstm.c
diff --git
a/src/php_pqstm.c
b/src/php_pqstm.c
index 6be580cf0607a24a35c94440250a523e6bfa5265..d9ec1eab1c689663079aff228b614a9dad56e5c5 100644
(file)
--- a/
src/php_pqstm.c
+++ b/
src/php_pqstm.c
@@
-244,11
+244,7
@@
static PHP_METHOD(pqstm, execAsync) {
} else if (obj->intern->conn->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
} else {
} else if (obj->intern->conn->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
} else {
- php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
- if (resolver.fci.size > 0) {
- obj->intern->conn->intern->onevent = resolver;
- php_pq_callback_addref(&obj->intern->conn->intern->onevent);
- }
+ php_pq_callback_recurse(&obj->intern->conn->intern->onevent, &resolver TSRMLS_CC);
obj->intern->conn->intern->poller = PQconsumeInput;
}
obj->intern->conn->intern->poller = PQconsumeInput;
}
@@
-313,11
+309,7
@@
static PHP_METHOD(pqstm, descAsync) {
} else if (!PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
throw_exce(EX_IO TSRMLS_CC, "Failed to describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
} else {
} else if (!PQsendDescribePrepared(obj->intern->conn->intern->conn, obj->intern->name)) {
throw_exce(EX_IO TSRMLS_CC, "Failed to describe statement: %s", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
} else {
- php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
- if (resolver.fci.size > 0) {
- obj->intern->conn->intern->onevent = resolver;
- php_pq_callback_addref(&obj->intern->conn->intern->onevent);
- }
+ php_pq_callback_recurse(&obj->intern->conn->intern->onevent, &resolver TSRMLS_CC);
obj->intern->conn->intern->poller = PQconsumeInput;
php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
}
obj->intern->conn->intern->poller = PQconsumeInput;
php_pqconn_notify_listeners(obj->intern->conn TSRMLS_CC);
}