X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqres.c;h=5406ebfd627ed7a8768b6d7dfe132098bc16b8e9;hb=a4fefa8b3887b4f0aea4f4eef16ddf87acdf2d33;hp=be3d039e9699e5142903f548fe7570009fd047e1;hpb=320bae0144fab755d678317f7ec14f9cb3ae1869;p=m6w6%2Fext-pq

diff --git a/src/php_pqres.c b/src/php_pqres.c
index be3d039..5406ebf 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -227,6 +227,23 @@ zval *php_pqres_typed_zval(php_pqres_t *res, Oid typ, zval *zv)
 		break;
 #endif
 
+	case PHP_PQ_OID_BYTEA:
+		if (!(res->auto_convert & PHP_PQRES_CONV_BYTEA)) {
+			goto noconversion;
+		} else {
+			size_t to_len;
+			char *to_str = (char *) PQunescapeBytea((unsigned char *) str->val, &to_len);
+
+			if (!to_str) {
+				ZVAL_NULL(zv);
+				php_error_docref(NULL, E_WARNING, "Failed to unsescape BYTEA: '%s'", str->val);
+			} else {
+				ZVAL_STRINGL(zv, to_str, to_len);
+				PQfreemem(to_str);
+			}
+		}
+		break;
+
 	default:
 		if (!(res->auto_convert & PHP_PQRES_CONV_ARRAY)) {
 			goto noconversion;
@@ -1146,7 +1163,7 @@ static PHP_METHOD(pqres, fetchAll) {
 	}
 }
 
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_count, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(ai_pqres_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, count) {
 	zend_error_handling zeh;
@@ -1194,7 +1211,7 @@ static PHP_METHOD(pqres, desc) {
 }
 
 #if PHP_VERSION_ID >= 80000
-ZEND_BEGIN_ARG_INFO_EX(ai_pqres_getIterator, 0, 0, 0)
+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_OBJ_INFO_EX(ai_pqres_getIterator, 0, 0, Traversable, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, getIterator)
 {
@@ -1336,6 +1353,7 @@ PHP_MINIT_FUNCTION(pqres)
 #if PHP_PQ_HAVE_PHP_JSON_H
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_JSON"), PHP_PQRES_CONV_JSON);
 #endif
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_BYTEA"), PHP_PQRES_CONV_BYTEA);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_ALL"), PHP_PQRES_CONV_ALL);
 
 	return SUCCESS;