fix leak; fix test

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

diff --git a/src/php_pqstm.c b/src/php_pqstm.c
index 178342a640d288c54ac097b3c68d6905037bec67..0dd2ebc50cd2532e027ef94762e9ce2f2e4ed8b8 100644 (file)
--- a/src/php_pqstm.c
+++ b/src/php_pqstm.c
@@ -29,7 +29,7 @@ zend_class_entry *php_pqstm_class_entry;
 static zend_object_handlers php_pqstm_object_handlers;
 static HashTable php_pqstm_object_prophandlers;
 
-static void php_pqstm_deallocate(php_pqstm_object_t *obj, zend_bool async, zend_bool silent)
+static void php_pqstm_deallocate(php_pqstm_object_t *obj, zend_bool async, zend_bool silent TSRMLS_DC)
 {
        if (obj->intern->allocated) {
                char *quoted_name = PQescapeIdentifier(obj->intern->conn->intern->conn, obj->intern->name, strlen(obj->intern->name));
@@ -75,10 +75,11 @@ static void php_pqstm_object_free(void *o TSRMLS_DC)
        if (obj->intern) {
                if (obj->intern->conn->intern) {
                        php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
-                       php_pqstm_deallocate(obj, 0, 1);
+                       php_pqstm_deallocate(obj, 0, 1 TSRMLS_CC);
                        php_pq_object_delref(obj->intern->conn TSRMLS_CC);
                }
                efree(obj->intern->name);
+               efree(obj->intern->query);
                zend_hash_destroy(&obj->intern->bound);
                if (obj->intern->params) {
                        php_pq_params_free(&obj->intern->params);
@@ -132,6 +133,31 @@ static void php_pqstm_object_read_connection(zval *object, void *o, zval *return
        php_pq_object_to_zval(obj->intern->conn, &return_value TSRMLS_CC);
 }
 
+static void php_pqstm_object_read_query(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+       php_pqstm_object_t *obj = o;
+
+       RETVAL_STRING(obj->intern->query, 1);
+}
+
+static void php_pqstm_object_read_types(zval *object, void *o, zval *return_value)
+{
+       int i;
+       HashTable *ht;
+       php_pqstm_object_t *obj;
+
+       obj = (php_pqstm_object_t *)o;
+       ht = (HashTable *)emalloc(sizeof(HashTable));
+
+       zend_hash_init(ht, obj->intern->params->type.count, NULL, ZVAL_PTR_DTOR, 0);
+       Z_TYPE_P(return_value) = IS_ARRAY;
+       Z_ARRVAL_P(return_value) = ht;
+
+       for (i = 0; i < obj->intern->params->type.count; i++) {
+               add_next_index_long(return_value, (long)obj->intern->params->type.oids[i]);
+       }
+}
+
 php_pqstm_t *php_pqstm_init(php_pqconn_object_t *conn, const char *name, const char *query, php_pq_params_t *params TSRMLS_DC)
 {
        php_pqstm_t *stm = ecalloc(1, sizeof(*stm));
@@ -491,6 +517,14 @@ PHP_MINIT_FUNCTION(pqstm)
        ph.read = php_pqstm_object_read_connection;
        zend_hash_add(&php_pqstm_object_prophandlers, "connection", sizeof("connection"), (void *) &ph, sizeof(ph), NULL);
 
+       zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("query"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqstm_object_read_query;
+       zend_hash_add(&php_pqstm_object_prophandlers, "query", sizeof("query"), (void *) &ph, sizeof(ph), NULL);
+
+       zend_declare_property_null(php_pqstm_class_entry, ZEND_STRL("types"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       ph.read = php_pqstm_object_read_types;
+       zend_hash_add(&php_pqstm_object_prophandlers, "types", sizeof("types"), (void *) &ph, sizeof(ph), NULL);
+
        return SUCCESS;
 }