Mark transaction as open when started async

[m6w6/ext-pq] / src / php_pqconn.c

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index f30b3a8316ebf0b2661e373ecae23ac0f0592f64..16d3f772c92ad9746bfeecfb941a0257526d937c 100644 (file)
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -1133,8 +1133,10 @@ static PHP_METHOD(pqconn, execAsync) {
                        throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
                } else if (!PQsendQuery(obj->intern->conn, query_str)) {
                        throw_exce(EX_IO TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
+#if HAVE_PQSETSINGLEROWMODE
                } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
                        throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
+#endif
                } else {
                        php_pq_callback_recurse(&obj->intern->onevent, &resolver TSRMLS_CC);
                        obj->intern->poller = PQconsumeInput;
@@ -1222,8 +1224,10 @@ static PHP_METHOD(pqconn, execParamsAsync) {
 
                        if (!rc) {
                                throw_exce(EX_IO TSRMLS_CC, "Failed to execute query (%s)", PHP_PQerrorMessage(obj->intern->conn));
+#if HAVE_PQSETSINGLEROWMODE
                        } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
                                throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
+#endif
                        } else {
                                php_pq_callback_recurse(&obj->intern->onevent, &resolver TSRMLS_CC);
                                obj->intern->poller = PQconsumeInput;
@@ -1310,9 +1314,6 @@ STATUS php_pqconn_prepare_async(zval *object, php_pqconn_object_t *obj, const ch
        if (!PQsendPrepare(obj->intern->conn, name, query, params->type.count, params->type.oids)) {
                rv = FAILURE;
                throw_exce(EX_IO TSRMLS_CC, "Failed to prepare statement (%s)", PHP_PQerrorMessage(obj->intern->conn));
-       } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
-               rv = FAILURE;
-               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
        } else {
                rv = SUCCESS;
                obj->intern->poller = PQconsumeInput;
@@ -1440,9 +1441,6 @@ STATUS php_pqconn_declare_async(zval *object, php_pqconn_object_t *obj, const ch
        if (!PQsendQuery(obj->intern->conn, decl)) {
                rv = FAILURE;
                throw_exce(EX_IO TSRMLS_CC, "Failed to declare cursor (%s)", PHP_PQerrorMessage(obj->intern->conn));
-       } else if (obj->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn)) {
-               rv = FAILURE;
-               throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn));
        } else {
                rv = SUCCESS;
                obj->intern->poller = PQconsumeInput;
@@ -1613,7 +1611,7 @@ STATUS php_pqconn_start_transaction(zval *zconn, php_pqconn_object_t *conn_obj,
        } else {
                PGresult *res;
                smart_str cmd = {0};
-               const char *il = isolation_level(&isolation);
+               const char *il = php_pq_isolation_level(&isolation);
 
                smart_str_appends(&cmd, "START TRANSACTION ISOLATION LEVEL ");
                smart_str_appends(&cmd, il);
@@ -1652,7 +1650,7 @@ STATUS php_pqconn_start_transaction_async(zval *zconn, php_pqconn_object_t *conn
                throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
        } else {
                smart_str cmd = {0};
-               const char *il = isolation_level(&isolation);
+               const char *il = php_pq_isolation_level(&isolation);
 
                smart_str_appends(&cmd, "START TRANSACTION ISOLATION LEVEL ");
                smart_str_appends(&cmd, il);
@@ -1738,6 +1736,7 @@ static PHP_METHOD(pqconn, startTransactionAsync) {
 
                        php_pq_object_addref(obj TSRMLS_CC);
                        txn->conn = obj;
+                       txn->open = 1;
                        txn->isolation = isolation;
                        txn->readonly = readonly;
                        txn->deferrable = deferrable;