X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=f2622d5184b73613019f15bca43f5b56a83c86f9;hp=4baa5ec0ecf923c5dcc70c8bc4b068b3b517383e;hb=7b61b6b19fea328ec2ccd767bf9dd4d4b3c0892f;hpb=967ea1785859c49a27c51c110839ea3296a020f4

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 4baa5ec..f2622d5 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -1288,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);
@@ -1314,11 +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));
-#if HAVE_PQSETSINGLEROWMODE
-	} 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));
-#endif
 	} else {
 		rv = SUCCESS;
 		obj->intern->poller = PQconsumeInput;
@@ -1355,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);
@@ -1446,11 +1429,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));
-#if HAVE_PQSETSINGLEROWMODE
-	} 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));
-#endif
 	} else {
 		rv = SUCCESS;
 		obj->intern->poller = PQconsumeInput;
@@ -1746,6 +1724,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;