X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=7d066c59df5056807e6bd50cb7a80e4e5e75d759;hp=f30b3a8316ebf0b2661e373ecae23ac0f0592f64;hb=ed63ffdb6068a001a65a9e0e892079f97594afed;hpb=3fe349a4acbfc6bc777cae313742c5d87d651550

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index f30b3a8..7d066c5 100644
--- 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;
@@ -1284,13 +1288,7 @@ static PHP_METHOD(pqconn, prepare) {
 			if (SUCCESS != php_pqconn_prepare(getThis(), obj, name_str, query_str, params TSRMLS_CC)) {
 				php_pq_params_free(&params);
 			} else {
-				php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
-
-				php_pq_object_addref(obj TSRMLS_CC);
-				stm->conn = obj;
-				stm->name = estrdup(name_str);
-				stm->params = params;
-				ZEND_INIT_SYMTABLE(&stm->bound);
+				php_pqstm_t *stm = php_pqstm_init(obj, name_str, query_str, params TSRMLS_CC);
 
 				return_value->type = IS_OBJECT;
 				return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, NULL TSRMLS_CC);
@@ -1310,9 +1308,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;
@@ -1349,13 +1344,7 @@ static PHP_METHOD(pqconn, prepareAsync) {
 			if (SUCCESS != php_pqconn_prepare_async(getThis(), obj, name_str, query_str, params TSRMLS_CC)) {
 				php_pq_params_free(&params);
 			} else {
-				php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
-
-				php_pq_object_addref(obj TSRMLS_CC);
-				stm->conn = obj;
-				stm->name = estrdup(name_str);
-				stm->params = params;
-				ZEND_INIT_SYMTABLE(&stm->bound);
+				php_pqstm_t *stm = php_pqstm_init(obj, name_str, query_str, params TSRMLS_CC);
 
 				return_value->type = IS_OBJECT;
 				return_value->value.obj = php_pqstm_create_object_ex(php_pqstm_class_entry, stm, NULL TSRMLS_CC);
@@ -1421,6 +1410,7 @@ static PHP_METHOD(pqconn, declare) {
 				cur->open = 1;
 				cur->name = estrdup(name_str);
 				cur->decl = decl;
+				cur->flags = flags;
 
 				return_value->type = IS_OBJECT;
 				return_value->value.obj = php_pqcur_create_object_ex(php_pqcur_class_entry, cur, NULL TSRMLS_CC);
@@ -1440,9 +1430,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 +1600,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 +1639,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 +1725,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;