moar tests

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

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 57818f4685badfaa95e2fd98c22376e6b23342b5..addeab3c93af153d6735a7d7b42d5caf55c73891 100644 (file)
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -93,6 +93,7 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 {
        zval *data = NULL;
        int c, cols;
+       php_pqres_object_t *res_obj = PQresultInstanceData(res, php_pqconn_event);
 
        if (data_ptr) {
                data = *data_ptr;
@@ -126,20 +127,35 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
                                        break;
                                }
                        } else {
-                               char *val = PQgetvalue(res, row, c);
-                               int len = PQgetlength(res, row, c);
+                               zval *zv, **zconv;
+
+                               if (res_obj && (SUCCESS == zend_hash_index_find(&res_obj->intern->converters, PQftype(res, c), (void *) &zconv))) {
+                                       zval *tmp = NULL;
+
+                                       MAKE_STD_ZVAL(zv);
+                                       ZVAL_STRINGL(zv, PQgetvalue(res, row, c), PQgetlength(res, row, c), 1);
+                                       zend_call_method_with_1_params(zconv, NULL, NULL, "convertfromstring", &tmp, zv);
+
+                                       if (tmp) {
+                                               zval_ptr_dtor(&zv);
+                                               zv = tmp;
+                                       }
+                               } else {
+                                       zv = php_pq_typed_zval(PQgetvalue(res, row, c), PQgetlength(res, row, c), PQftype(res, c) TSRMLS_CC);
+                               }
 
                                switch (fetch_type) {
                                case PHP_PQRES_FETCH_OBJECT:
-                                       add_property_stringl(data, PQfname(res, c), val, len, 1);
+                                       add_property_zval(data, PQfname(res, c), zv);
+                                       zval_ptr_dtor(&zv);
                                        break;
 
                                case PHP_PQRES_FETCH_ASSOC:
-                                       add_assoc_stringl(data, PQfname(res, c), val, len, 1);
+                                       add_assoc_zval(data, PQfname(res, c), zv);
                                        break;
 
                                case PHP_PQRES_FETCH_ARRAY:
-                                       add_index_stringl(data, c, val, len ,1);
+                                       add_index_zval(data, c, zv);
                                        break;
                                }
                        }
@@ -248,13 +264,15 @@ STATUS php_pqres_success(PGresult *res TSRMLS_DC)
        }
 }
 
-void php_pqres_init_instance_data(PGresult *res, php_pqres_object_t **ptr TSRMLS_DC)
+void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *conn_obj, php_pqres_object_t **ptr TSRMLS_DC)
 {
        php_pqres_object_t *obj;
        php_pqres_t *r = ecalloc(1, sizeof(*r));
 
        r->res = res;
-       ZEND_INIT_SYMTABLE(&r->bound);
+       zend_hash_init(&r->bound, 0, 0, ZVAL_PTR_DTOR, 0);
+       zend_hash_init(&r->converters, 0, 0, ZVAL_PTR_DTOR, 0);
+       zend_hash_copy(&r->converters, &conn_obj->intern->converters, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
        php_pqres_create_object_ex(php_pqres_class_entry, r, &obj TSRMLS_CC);
 
        PQresultSetInstanceData(res, php_pqconn_event, obj);
@@ -283,6 +301,7 @@ static void php_pqres_object_free(void *o TSRMLS_DC)
                }
 
                zend_hash_destroy(&obj->intern->bound);
+               zend_hash_destroy(&obj->intern->converters);
 
                efree(obj->intern);
                obj->intern = NULL;
@@ -441,6 +460,10 @@ static STATUS column_nn(php_pqres_object_t *obj, zval *zcol, php_pqres_col_t *co
        char *name = NULL;
 
        switch (Z_TYPE_P(zcol)) {
+       case IS_LONG:
+               index = Z_LVAL_P(zcol);
+               break;
+
        default:
                convert_to_string(zcol);
                /* no break */
@@ -450,10 +473,6 @@ static STATUS column_nn(php_pqres_object_t *obj, zval *zcol, php_pqres_col_t *co
                        name = Z_STRVAL_P(zcol);
                }
                break;
-
-       case IS_LONG:
-               index = Z_LVAL_P(zcol);
-               break;
        }
 
        if (name) {
@@ -614,16 +633,17 @@ static zval **column_at(zval *row, int col TSRMLS_DC)
        return data;
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 0)
-       ZEND_ARG_INFO(0, col_num)
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_col, 0, 0, 2)
+       ZEND_ARG_INFO(0, col)
+       ZEND_ARG_INFO(1, ref)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, fetchCol) {
        zend_error_handling zeh;
-       long fetch_col = 0;
+       zval *zcol, *zref;
        STATUS rv;
 
        zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
-       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &fetch_col);
+       rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z", &zcol, &zref);
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
        if (SUCCESS == rv) {
@@ -636,11 +656,23 @@ static PHP_METHOD(pqres, fetchCol) {
 
                        zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
                        php_pqres_iteration(getThis(), obj, obj->intern->iter ? obj->intern->iter->fetch_type : 0, &row TSRMLS_CC);
-                       if (row) {
-                               zval **col = column_at(*row, fetch_col TSRMLS_CC);
+                       if (!row) {
+                               RETVAL_FALSE;
+                       } else {
+                               php_pqres_col_t col;
+
+                               if (SUCCESS != column_nn(obj, zcol, &col TSRMLS_CC)) {
+                                       RETVAL_FALSE;
+                               } else {
+                                       zval **zres = column_at(*row, col.num TSRMLS_CC);
 
-                               if (col) {
-                                       RETVAL_ZVAL(*col, 1, 0);
+                                       if (!zres) {
+                                               RETVAL_FALSE;
+                                       } else {
+                                               zval_dtor(zref);
+                                               ZVAL_ZVAL(zref, *zres, 1, 1);
+                                               RETVAL_TRUE;
+                                       }
                                }
                        }
                        zend_restore_error_handling(&zeh TSRMLS_CC);
@@ -862,6 +894,12 @@ static zend_function_entry php_pqres_methods[] = {
        {0}
 };
 
+PHP_MSHUTDOWN_FUNCTION(pqres)
+{
+       zend_hash_destroy(&php_pqres_object_prophandlers);
+       return SUCCESS;
+}
+
 PHP_MINIT_FUNCTION(pqres)
 {
        zend_class_entry ce = {0};
@@ -879,6 +917,7 @@ PHP_MINIT_FUNCTION(pqres)
        php_pqres_object_handlers.write_property = php_pq_object_write_prop;
        php_pqres_object_handlers.clone_obj = NULL;
        php_pqres_object_handlers.get_property_ptr_ptr = NULL;
+       php_pqres_object_handlers.get_gc = NULL;
        php_pqres_object_handlers.get_debug_info = php_pq_object_debug_info;
        php_pqres_object_handlers.get_properties = php_pq_object_properties;
        php_pqres_object_handlers.count_elements = php_pqres_count_elements;