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

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 16d3f77..7d066c5 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);
@@ -1350,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);
@@ -1422,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);