X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.c;h=2c756558fef2bc1800b6154e8469e7681a113098;hp=eeda25899fbbff521836d2775c2ce4c3f43abd0b;hb=753359f19c5d29f08faca43ee735c49c217230a7;hpb=1c52f7b4a52260c93351de3d1c83748f85e77f6c

diff --git a/src/php_pqres.c b/src/php_pqres.c
index eeda258..2c75655 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -17,6 +17,7 @@
 #include <php.h>
 
 #include <ext/spl/spl_iterators.h>
+#include <ext/json/php_json.h>
 #include <libpq-events.h>
 
 #include "php_pq.h"
@@ -167,6 +168,18 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
 		php_pqdt_from_string(val, len, "Y-m-d H:i:s.uO", zv TSRMLS_CC);
 		break;
 
+#ifdef PHP_PQ_OID_JSON
+#	ifdef PHP_PQ_OID_JSONB
+	case PHP_PQ_OID_JSONB:
+#	endif
+	case PHP_PQ_OID_JSON:
+		if (!(res->auto_convert & PHP_PQRES_CONV_JSON)) {
+			goto noconversion;
+		}
+		php_json_decode_ex(zv, val, len, 0, 512 /* PHP_JSON_DEFAULT_DEPTH */ TSRMLS_CC);
+		break;
+#endif
+
 	default:
 		if (!(res->auto_convert & PHP_PQRES_CONV_ARRAY)) {
 			goto noconversion;
@@ -642,8 +655,14 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqres_bind, 0, 0, 2)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqres, bind) {
 	zval *zcol, *zref;
+	zend_error_handling zeh;
+	STATUS rv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z", &zcol, &zref);
+	zend_restore_error_handling(&zeh TSRMLS_CC);
 
-	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/z", &zcol, &zref)) {
+	if (SUCCESS == rv) {
 		php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
 
 		if (!obj->intern) {
@@ -798,9 +817,7 @@ static PHP_METHOD(pqres, fetchCol) {
 
 			zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
 			php_pqres_iteration(getThis(), obj, obj->intern->iter ? obj->intern->iter->fetch_type : 0, &row TSRMLS_CC);
-			if (!row) {
-				RETVAL_FALSE;
-			} else {
+			if (row) {
 				php_pqres_col_t col;
 
 				if (SUCCESS != column_nn(obj, zcol, &col TSRMLS_CC)) {
@@ -843,7 +860,6 @@ static PHP_METHOD(pqres, fetchAllCols) {
 			php_pqres_col_t col;
 
 			zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
-
 			if (SUCCESS == column_nn(obj, zcol, &col TSRMLS_CC)) {
 				int r, rows = PQntuples(obj->intern->res);
 
@@ -852,7 +868,6 @@ static PHP_METHOD(pqres, fetchAllCols) {
 					add_next_index_zval(return_value, php_pqres_get_col(obj->intern, r, col.num TSRMLS_CC));
 				}
 			}
-
 			zend_restore_error_handling(&zeh TSRMLS_CC);
 		}
 	}
@@ -1153,7 +1168,7 @@ PHP_MINIT_FUNCTION(pqres)
 	zend_hash_add(&php_pqres_object_prophandlers, "fetchType", sizeof("fetchType"), (void *) &ph, sizeof(ph), NULL);
 	ph.write = NULL;
 
-	zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("autoConvert"), PHP_PQRES_FETCH_ARRAY, ZEND_ACC_PUBLIC TSRMLS_CC);
+	zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("autoConvert"), PHP_PQRES_CONV_ALL, ZEND_ACC_PUBLIC TSRMLS_CC);
 	ph.read = php_pqres_object_read_auto_conv;
 	ph.write = php_pqres_object_write_auto_conv;
 	zend_hash_add(&php_pqres_object_prophandlers, "autoConvert", sizeof("autoConvert"), (void *) &ph, sizeof(ph), NULL);
@@ -1180,6 +1195,7 @@ PHP_MINIT_FUNCTION(pqres)
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_SCALAR"), PHP_PQRES_CONV_SCALAR TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_ARRAY"), PHP_PQRES_CONV_ARRAY TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_DATETIME"), PHP_PQRES_CONV_DATETIME TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_JSON"), PHP_PQRES_CONV_JSON TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_ALL"), PHP_PQRES_CONV_ALL TSRMLS_CC);
 
 	return SUCCESS;