return ZEND_HASH_APPLY_KEEP;
}
+static int apply_to_param_from_array(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
+{
+ zval **zparam = p;
+ unsigned j, *i = va_arg(argv, unsigned *);
+ smart_str *s = va_arg(argv, smart_str *);
+ char *tmp;
+ size_t len;
+ int tmp_len;
+
+ if ((*i)++) {
+ smart_str_appendc(s, ',');
+ }
+
+ switch (Z_TYPE_PP(zparam)) {
+ case IS_NULL:
+ smart_str_appends(s, "NULL");
+ break;
+
+ case IS_BOOL:
+ smart_str_appends(s, Z_BVAL_PP(zparam) ? "t" : "f");
+ break;
+
+ case IS_LONG:
+ smart_str_append_long(s, Z_LVAL_PP(zparam));
+ break;
+
+ case IS_DOUBLE:
+ len = spprintf(&tmp, 0, "%F", Z_DVAL_PP(zparam));
+ smart_str_appendl(s, tmp, len);
+ efree(tmp);
+ break;
+
+ case IS_ARRAY:
+ j = 0;
+ smart_str_appendc(s, '{');
+ zend_hash_apply_with_arguments(Z_ARRVAL_PP(zparam) TSRMLS_CC, apply_to_param_from_array, 2, &j, s);
+ smart_str_appendc(s, '}');
+ break;
+
+ default:
+ {
+ SEPARATE_ZVAL(zparam);
+ if (Z_TYPE_PP(zparam) != IS_STRING) {
+ convert_to_string(*zparam);
+ }
+
+ tmp = php_addslashes(Z_STRVAL_PP(zparam), Z_STRLEN_PP(zparam), &tmp_len, 0 TSRMLS_CC);
+ smart_str_appendc(s, '"');
+ smart_str_appendl(s, tmp, tmp_len);
+ smart_str_appendc(s, '"');
+
+ if (*zparam != *((zval **) p)) {
+ zval_ptr_dtor(zparam);
+ }
+ break;
+ }
+ }
+
+ ++(*i);
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+static void array_param_to_string(HashTable *ht, char **str, int *len TSRMLS_DC)
+{
+ smart_str s = {0};
+ unsigned i = 0;
+
+ smart_str_appendc(&s, '{');
+ zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param_from_array, 2, &i, &s);
+ smart_str_appendc(&s, '}');
+
+ smart_str_0(&s);
+ *str = s.c;
+ *len = s.len;
+}
+
static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
{
char ***params;
case IS_NULL:
**params = NULL;
++*params;
- break;
+ return ZEND_HASH_APPLY_KEEP;
case IS_BOOL:
**params = Z_BVAL_PP(zparam) ? "t" : "f";
++*params;
- break;
+ return ZEND_HASH_APPLY_KEEP;
case IS_DOUBLE:
SEPARATE_ZVAL(zparam);
Z_TYPE_PP(zparam) = IS_STRING;
Z_STRLEN_PP(zparam) = spprintf(&Z_STRVAL_PP(zparam), 0, "%F", Z_DVAL_PP((zval **)p));
- /* no break */
+ break;
+
+ case IS_ARRAY:
+ {
+ zval *tmp;
+ MAKE_STD_ZVAL(tmp);
+ Z_TYPE_P(tmp) = IS_STRING;
+ array_param_to_string(Z_ARRVAL_PP(zparam), &Z_STRVAL_P(tmp), &Z_STRLEN_P(tmp) TSRMLS_CC);
+ zparam = &tmp;
+ break;
+ }
default:
convert_to_string_ex(zparam);
- /* no break */
-
- case IS_STRING:
- **params = Z_STRVAL_PP(zparam);
- ++*params;
-
- if (*zparam != *(zval **)p) {
- zend_hash_next_index_insert(zdtor, zparam, sizeof(zval *), NULL);
- }
break;
}
+ **params = Z_STRVAL_PP(zparam);
+ ++*params;
+
+ if (*zparam != *(zval **)p) {
+ zend_hash_next_index_insert(zdtor, zparam, sizeof(zval *), NULL);
+ }
return ZEND_HASH_APPLY_KEEP;
}
#ifdef ZTS
void ***ts;
#endif
+ Oid typ;
unsigned quotes:1;
unsigned escaped:1;
} ArrayParserState;
static STATUS add_element(ArrayParserState *a, const char *start)
{
zval *zelem;
+ size_t el_len = a->ptr - start;
+ char *el_str = estrndup(start, el_len);
TSRMLS_FETCH_FROM_CTX(a->ts);
- MAKE_STD_ZVAL(zelem);
if (a->quotes) {
- ZVAL_STRINGL(zelem, start, a->ptr - start, 1);
- php_stripslashes(Z_STRVAL_P(zelem), &Z_STRLEN_P(zelem) TSRMLS_CC);
+ int tmp_len = el_len;
+
+ php_stripslashes(el_str, &tmp_len TSRMLS_CC);
+ el_len = tmp_len;
} else if ((a->ptr - start == 4) && !strncmp(start, "NULL", 4)) {
+ efree(el_str);
+ el_str = NULL;
+ el_len = 0;
+ }
+
+ if (!el_str) {
+ MAKE_STD_ZVAL(zelem);
ZVAL_NULL(zelem);
} else {
- long lval = 0;
- double dval = 0;
-
- switch (is_numeric_string(start, a->ptr - start, &lval, &dval, 0)) {
- case IS_LONG:
- ZVAL_LONG(zelem, lval);
- break;
-
- case IS_DOUBLE:
- ZVAL_DOUBLE(zelem, dval);
- break;
+ zelem = php_pq_typed_zval(el_str, el_len, a->typ TSRMLS_CC);
- default:
- ZVAL_STRINGL(zelem, start, a->ptr - start, 1);
- break;
- }
+ efree(el_str);
}
return zend_hash_next_index_insert(&a->list->ht, &zelem, sizeof(zval *), NULL);
return SUCCESS;
}
-HashTable *php_pq_parse_array(const char *val_str, size_t val_len TSRMLS_DC)
+HashTable *php_pq_parse_array(const char *val_str, size_t val_len, Oid typ TSRMLS_DC)
{
HashTable *ht = NULL;
ArrayParserState a = {0};
TSRMLS_SET_CTX(a.ts);
+ a.typ = typ;
a.ptr = val_str;
a.end = val_str + val_len;
return ht;
}
+zval *php_pq_typed_zval(char *val, size_t len, Oid typ TSRMLS_DC)
+{
+ zval *zv;
+
+ MAKE_STD_ZVAL(zv);
+
+ switch (typ) {
+#ifdef HAVE_PHP_PQ_TYPE_H
+# undef PHP_PQ_TYPE
+# include "php_pq_type.h"
+ case PHP_PQ_OID_BOOL:
+ 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:
+ ZVAL_LONG(zv, zend_atol(val, len));
+ break;
+
+ case PHP_PQ_OID_FLOAT4:
+ case PHP_PQ_OID_FLOAT8:
+ ZVAL_DOUBLE(zv, zend_strtod(val, NULL));
+ break;
+
+ case PHP_PQ_OID_DATE:
+ php_pqdt_from_string(val, len, "Y-m-d", zv TSRMLS_CC);
+ break;
+
+ case PHP_PQ_OID_ABSTIME:
+ php_pqdt_from_string(val, len, "Y-m-d H:i:s", zv TSRMLS_CC);
+ break;
+
+ case PHP_PQ_OID_TIMESTAMP:
+ php_pqdt_from_string(val, len, "Y-m-d H:i:s.u", zv TSRMLS_CC);
+ break;
+
+ case PHP_PQ_OID_TIMESTAMPTZ:
+ php_pqdt_from_string(val, len, "Y-m-d H:i:s.uO", zv TSRMLS_CC);
+ break;
+
+ default:
+ if (PHP_PQ_TYPE_IS_ARRAY(typ) && (Z_ARRVAL_P(zv) = php_pq_parse_array(val, len, PHP_PQ_TYPE_OF_ARRAY(typ) TSRMLS_CC))) {
+ Z_TYPE_P(zv) = IS_ARRAY;
+ } else {
+ ZVAL_STRINGL(zv, val, len, 1);
+ }
+ break;
+#else
+ case 16: /* BOOL */
+ ZVAL_BOOL(zv, *val == 't');
+ break;
+
+ default:
+ ZVAL_STRINGL(zv, val, len, 1);
+#endif
+ }
+
+ return zv;
+}
+
/*
* Local variables:
* tab-width: 4
projects / m6w6 / ext-pq / blobdiff