X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.c;h=cbaf93344c0de775ac91f89f7749a9b184247512;hp=67dac3403b3fd951561d75e89ac1d104f95f1a3c;hb=218002ba9087cf49f90e5f098f68a154d6092c78;hpb=2805a4d1f8dc3e718ba7822040208e9c608358e0

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 67dac34..cbaf933 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -88,6 +88,111 @@ static STATUS php_pqres_iterator_valid(zend_object_iterator *i TSRMLS_DC)
 	return SUCCESS;
 }
 
+zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRMLS_DC)
+{
+	zval *zv, **zconv;
+
+	MAKE_STD_ZVAL(zv);
+
+	if (SUCCESS == zend_hash_index_find(&res->converters, typ, (void *) &zconv)) {
+		zval *tmp = NULL;
+
+		ZVAL_STRINGL(zv, val, len, 1);
+		zend_call_method_with_1_params(zconv, NULL, NULL, "convertfromstring", &tmp, zv);
+
+		if (tmp) {
+			zval_ptr_dtor(&zv);
+			zv = tmp;
+		}
+
+		return zv;
+	}
+
+	switch (typ) {
+#ifdef HAVE_PHP_PQ_TYPE_H
+#	undef PHP_PQ_TYPE
+#	include "php_pq_type.h"
+	case PHP_PQ_OID_BOOL:
+		if (!(res->auto_convert & PHP_PQRES_CONV_BOOL)) {
+			goto noconversion;
+		}
+		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:
+		if (!(res->auto_convert & PHP_PQRES_CONV_INT)) {
+			goto noconversion;
+		}
+		ZVAL_LONG(zv, zend_atol(val, len));
+		break;
+
+	case PHP_PQ_OID_FLOAT4:
+	case PHP_PQ_OID_FLOAT8:
+		if (!(res->auto_convert & PHP_PQRES_CONV_FLOAT)) {
+			goto noconversion;
+		}
+		ZVAL_DOUBLE(zv, zend_strtod(val, NULL));
+		break;
+
+	case PHP_PQ_OID_DATE:
+		if (!(res->auto_convert & PHP_PQRES_CONV_DATETIME)) {
+			goto noconversion;
+		}
+		php_pqdt_from_string(val, len, "Y-m-d", zv TSRMLS_CC);
+		break;
+
+	case PHP_PQ_OID_ABSTIME:
+		if (!(res->auto_convert & PHP_PQRES_CONV_DATETIME)) {
+			goto noconversion;
+		}
+		php_pqdt_from_string(val, len, "Y-m-d H:i:s", zv TSRMLS_CC);
+		break;
+
+	case PHP_PQ_OID_TIMESTAMP:
+		if (!(res->auto_convert & PHP_PQRES_CONV_DATETIME)) {
+			goto noconversion;
+		}
+		php_pqdt_from_string(val, len, "Y-m-d H:i:s.u", zv TSRMLS_CC);
+		break;
+
+	case PHP_PQ_OID_TIMESTAMPTZ:
+		if (!(res->auto_convert & PHP_PQRES_CONV_DATETIME)) {
+			goto noconversion;
+		}
+		php_pqdt_from_string(val, len, "Y-m-d H:i:s.uO", zv TSRMLS_CC);
+		break;
+
+	default:
+		if (!(res->auto_convert & PHP_PQRES_CONV_ARRAY)) {
+			goto noconversion;
+		}
+		if (PHP_PQ_TYPE_IS_ARRAY(typ) && (Z_ARRVAL_P(zv) = php_pq_parse_array(res, val, len, PHP_PQ_TYPE_OF_ARRAY(typ) TSRMLS_CC))) {
+			Z_TYPE_P(zv) = IS_ARRAY;
+		} else {
+			noconversion:
+			ZVAL_STRINGL(zv, val, len, 1);
+		}
+		break;
+#else
+	case 16: /* BOOL */
+		if (res->auto_convert & PHP_PQRES_CONV_BOOL) {
+			ZVAL_BOOL(zv, *val == 't');
+			break;
+		}
+	default:
+		ZVAL_STRINGL(zv, val, len, 1);
+#endif
+	}
+
+	return zv;
+}
+
 zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr TSRMLS_DC)
 {
 	zval *data = NULL;
@@ -126,22 +231,9 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 					break;
 				}
 			} else {
-				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);
+				zval *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);
-				}
+				zv = php_pq_typed_zval(&res_obj->intern->converters, PQgetvalue(res, row, c), PQgetlength(res, row, c), PQftype(res, c) TSRMLS_CC);
 
 				switch (fetch_type) {
 				case PHP_PQRES_FETCH_OBJECT:
@@ -272,8 +364,10 @@ void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *conn_obj,
 	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);
 
+	r->default_fetch_type = conn_obj->intern->default_fetch_type;
+
+	php_pqres_create_object_ex(php_pqres_class_entry, r, &obj TSRMLS_CC);
 	PQresultSetInstanceData(res, php_pqconn_event, obj);
 
 	if (ptr) {
@@ -391,7 +485,7 @@ static void php_pqres_object_read_fetch_type(zval *object, void *o, zval *return
 	if (obj->intern->iter) {
 		RETVAL_LONG(obj->intern->iter->fetch_type);
 	} else {
-		RETVAL_LONG(PHP_PQRES_FETCH_ARRAY);
+		RETVAL_LONG(obj->intern->default_fetch_type);
 	}
 }
 
@@ -600,7 +694,7 @@ static PHP_METHOD(pqres, fetchRow) {
 			zval **row = NULL;
 
 			if (fetch_type == -1) {
-				 fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+				 fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : obj->intern->default_fetch_type;
 			}
 
 			zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
@@ -760,7 +854,7 @@ static PHP_METHOD(pqres, map) {
 			}
 
 			if (fetch_type == -1) {
-				fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+				fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : obj->intern->default_fetch_type;
 			}
 
 			if (keys) {
@@ -857,7 +951,7 @@ static PHP_METHOD(pqres, fetchAll) {
 			int r, rows = PQntuples(obj->intern->res);
 
 			if (fetch_type == -1) {
-				 fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : PHP_PQRES_FETCH_ARRAY;
+				 fetch_type = obj->intern->iter ? obj->intern->iter->fetch_type : obj->intern->default_fetch_type;
 			}
 
 			array_init(return_value);