X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.c;h=2ebcf74dbc2a2944d32855eb9081ce212f1e7f43;hp=874751a5f1736003c56367cf24d5e746ff807116;hb=9e37136f3b7f6d2d2d35b5626cd56dab0d5acce3;hpb=e5a91b5de306354451031b19a64cc2c7c852da49

diff --git a/src/php_pqres.c b/src/php_pqres.c
index 874751a..2ebcf74 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -127,12 +127,13 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 				}
 			} else {
 				zval *zv;
+				Oid typ = PQftype(res, c);
 				char *val = PQgetvalue(res, row, c);
 				int len = PQgetlength(res, row, c);
 
 				MAKE_STD_ZVAL(zv);
 
-				switch (PQftype(res, c)) {
+				switch (typ) {
 #ifdef HAVE_PHP_PQ_TYPE_H
 #	undef PHP_PQ_TYPE
 #	include "php_pq_type.h"
@@ -178,7 +179,11 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 					break;
 #endif
 				default:
-					ZVAL_STRINGL(zv, val, len, 1);
+					if (PHP_PQ_TYPE_IS_ARRAY(typ) && (Z_ARRVAL_P(zv) = php_pq_parse_array(val, len TSRMLS_CC))) {
+						Z_TYPE_P(zv) = IS_ARRAY;
+					} else {
+						ZVAL_STRINGL(zv, val, len, 1);
+					}
 					break;
 				}