X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.c;h=addeab3c93af153d6735a7d7b42d5caf55c73891;hp=75355154acc971ed4aa79ffc1f767707ddef1d24;hb=de42b70bed81a6f47bbb8f614413ae9a04ec9940;hpb=fad4fe6a60c56ad5d5752e10abd1085884cc09c2

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 7535515..addeab3 100644
--- 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,51 +127,21 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 					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;
+				zval *zv, **zconv;
 
-				case PHP_PQ_OID_ABSTIME:
-				case PHP_PQ_OID_DATE:
-				case PHP_PQ_OID_TIMESTAMP:
-				case PHP_PQ_OID_TIMESTAMPTZ:
-					php_pq_date_from_string(val, len, 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 18: /* 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) {
@@ -293,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);
@@ -328,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;
@@ -920,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};