#include <php.h>
#include <ext/standard/php_string.h>
-#if PHP_PQ_HAVE_PHP_JSON_H
-#include <php_json.h> /* we've added the include directory to INCLUDES */
-#endif
+#include <ext/json/php_json.h>
#include <Zend/zend_smart_str.h>
#include <Zend/zend_interfaces.h>
static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid type)
{
+#ifdef PHP_PQ_OID_JSON
smart_str str = {0};
+#endif
switch (type) {
-#if PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
-# ifdef PHP_PQ_OID_JSONB
+#ifdef PHP_PQ_OID_JSON
+# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
-# endif
+# endif
case PHP_PQ_OID_JSON:
+# if PHP_VERSION_ID >= 70100
+ JSON_G(encode_max_depth) = PHP_JSON_PARSER_DEFAULT_DEPTH;
+# endif
php_json_encode(&str, zobj, PHP_JSON_UNESCAPED_UNICODE);
smart_str_0(&str);
return str.s;
case PHP_PQ_OID_DATE:
return php_pqdt_to_string(zobj, "Y-m-d");
-
+#ifdef PHP_PQ_OID_ABSTIME
case PHP_PQ_OID_ABSTIME:
return php_pqdt_to_string(zobj, "Y-m-d H:i:s");
-
+#endif
case PHP_PQ_OID_TIMESTAMP:
return php_pqdt_to_string(zobj, "Y-m-d H:i:s.u");
struct apply_to_param_from_array_arg subarg, *arg = arg_ptr;
char *tmp;
size_t len;
- zend_string *str;
+ zend_string *str, *tmpstr;
if (arg->index++) {
smart_str_appendc(arg->buffer, arg->delim);
zval ztype, rv;
ZVAL_LONG(&ztype, arg->type);
- zend_call_method_with_2_params(arg->zconv, NULL, NULL, "converttostring", &rv, zparam, &ztype);
- str = zval_get_string(&rv);
+ php_pq_call_method(arg->zconv, "converttostring", 2, &rv, zparam, &ztype);
+ tmpstr = zval_get_string(&rv);
+ zval_ptr_dtor(&rv);
goto append_string;
} else {
+ again:
switch (Z_TYPE_P(zparam)) {
+ case IS_REFERENCE:
+ ZVAL_DEREF(zparam);
+ goto again;
+
case IS_NULL:
smart_str_appends(arg->buffer, "NULL");
break;
break;
case IS_OBJECT:
- if ((str = object_param_to_string(arg->params, zparam, arg->type))) {
+ if ((tmpstr = object_param_to_string(arg->params, zparam, arg->type))) {
goto append_string;
}
/* no break */
default:
- str = zval_get_string(zparam);
+ tmpstr = zval_get_string(zparam);
append_string:
- str = php_addslashes(str, 1);
+#if PHP_VERSION_ID < 70300
+ str = php_addslashes(tmpstr, 1);
+#else
+ str = php_addslashes(tmpstr);
+ zend_string_release(tmpstr);
+#endif
smart_str_appendc(arg->buffer, '"');
smart_str_appendl(arg->buffer, str->val, str->len);
smart_str_appendc(arg->buffer, '"');
struct apply_to_param_from_array_arg arg = {NULL};
switch (type) {
-#if PHP_PQ_HAVE_PHP_JSON_H && defined(PHP_PQ_OID_JSON)
-# ifdef PHP_PQ_OID_JSONB
+#ifdef PHP_PQ_OID_JSON
+# ifdef PHP_PQ_OID_JSONB
case PHP_PQ_OID_JSONB:
-# endif
+# endif
case PHP_PQ_OID_JSON:
php_json_encode(&s, zarr, PHP_JSON_UNESCAPED_UNICODE);
break;
smart_str_appendc(arg.buffer, '{');
SEPARATE_ZVAL(zarr);
zend_hash_apply_with_argument(Z_ARRVAL_P(zarr), apply_to_param_from_array, &arg);
- zval_ptr_dtor(zarr);
smart_str_appendc(arg.buffer, '}');
break;
}
ZVAL_NULL(&rv);
ZVAL_LONG(&ztype, type);
- zend_call_method_with_2_params(zconv, NULL, NULL, "converttostring", &rv, zpp, &ztype);
+ php_pq_call_method(zconv, "converttostring", 2, &rv, zpp, &ztype);
convert_to_string(&rv);
p->param.strings[index] = Z_STRVAL_P(&rv);
zend_hash_next_index_insert(&p->param.dtor, &rv);
char tmp_str[64];
size_t tmp_len = 0;
+ again:
switch (Z_TYPE_P(zpp)) {
+ case IS_REFERENCE:
+ ZVAL_DEREF(zpp);
+ goto again;
+
case IS_NULL:
p->param.strings[index] = NULL;
return;
break;
case IS_ARRAY:
- str = array_param_to_string(p, &tmp, type);
+ str = array_param_to_string(p, zpp, type);
break;
case IS_OBJECT:
break;
}
/* no break */
-
default:
str = zval_get_string(zpp);
break;
{
struct apply_to_params_arg *arg = arg_ptr;
- SEPARATE_ZVAL_IF_NOT_REF(zp);
+ ZVAL_DEREF(zp);
+ SEPARATE_ZVAL(zp);
php_pq_params_set_param(arg->params, arg->index++, zp);
return ZEND_HASH_APPLY_KEEP;
}