{
zval *data = NULL;
int c, cols;
+ php_pqres_object_t *res_obj = PQresultInstanceData(res, php_pqconn_event);
if (data_ptr) {
data = *data_ptr;
break;
}
} else {
- zval *zv;
- char *val = PQgetvalue(res, row, c);
- int len = PQgetlength(res, row, c);
-
- MAKE_STD_ZVAL(zv);
-
- switch (PQftype(res, c)) {
-#ifdef HAVE_PHP_PQ_TYPE_H
-# undef PHP_PQ_TYPE
-# include "php_pq_type.h"
- case PHP_PQ_OID_BOOL:
- ZVAL_BOOL(zv, *val == 't');
- break;
-#if SIZEOF_LONG >= 8
- case PHP_PQ_OID_INT8:
- case PHP_PQ_OID_TID:
-#endif
- case PHP_PQ_OID_INT4:
- case PHP_PQ_OID_INT2:
- case PHP_PQ_OID_XID:
- case PHP_PQ_OID_OID:
- ZVAL_LONG(zv, zend_atol(val, len));
- break;
-
- case PHP_PQ_OID_FLOAT4:
- case PHP_PQ_OID_FLOAT8:
- ZVAL_DOUBLE(zv, zend_strtod(val, NULL));
- break;
-
- case PHP_PQ_OID_DATE:
- php_pqdt_from_string(val, len, "Y-m-d", zv TSRMLS_CC);
- break;
-
- case PHP_PQ_OID_ABSTIME:
- php_pqdt_from_string(val, len, "Y-m-d H:i:s", zv TSRMLS_CC);
- break;
+ zval *zv, **zconv;
- case PHP_PQ_OID_TIMESTAMP:
- php_pqdt_from_string(val, len, "Y-m-d H:i:s.u", zv TSRMLS_CC);
- break;
-
- case PHP_PQ_OID_TIMESTAMPTZ:
- php_pqdt_from_string(val, len, "Y-m-d H:i:s.uO", zv TSRMLS_CC);
- break;
+ 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);
-#else
- case 16: /* BOOL */
- ZVAL_BOOL(zv, *val == 't');
- break;
-#endif
- default:
- ZVAL_STRINGL(zv, val, len, 1);
- break;
+ 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) {
}
}
-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);
}
zend_hash_destroy(&obj->intern->bound);
+ zend_hash_destroy(&obj->intern->converters);
efree(obj->intern);
obj->intern = NULL;
RETVAL_FALSE;
} else {
zval_dtor(zref);
- ZVAL_ZVAL(zref, *zres, 1, 1);
+ ZVAL_ZVAL(zref, *zres, 1, 0);
RETVAL_TRUE;
}
}
}
}
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_desc, 0, 0, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, desc) {
+ if (SUCCESS == zend_parse_parameters_none()) {
+ php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+ if (!obj->intern) {
+ throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
+ } else {
+ int p, params;
+
+ array_init(return_value);
+ for (p = 0, params = PQnparams(obj->intern->res); p < params; ++p) {
+ add_next_index_long(return_value, PQparamtype(obj->intern->res, p));
+ }
+ }
+ }
+}
+
static zend_function_entry php_pqres_methods[] = {
PHP_ME(pqres, bind, ai_pqres_bind, ZEND_ACC_PUBLIC)
PHP_ME(pqres, fetchBound, ai_pqres_fetch_bound, ZEND_ACC_PUBLIC)
PHP_ME(pqres, fetchAll, ai_pqres_fetch_all, ZEND_ACC_PUBLIC)
PHP_ME(pqres, count, ai_pqres_count, ZEND_ACC_PUBLIC)
PHP_ME(pqres, map, ai_pqres_map, ZEND_ACC_PUBLIC)
+ PHP_ME(pqres, desc, ai_pqres_desc, ZEND_ACC_PUBLIC)
{0}
};
+PHP_MSHUTDOWN_FUNCTION(pqres)
+{
+ zend_hash_destroy(&php_pqres_object_prophandlers);
+ return SUCCESS;
+}
+
PHP_MINIT_FUNCTION(pqres)
{
zend_class_entry ce = {0};