return 0;
}
-static int apply_to_oid(void *p, void *arg TSRMLS_DC)
-{
- Oid **types = arg;
- zval **ztype = p;
-
- if (Z_TYPE_PP(ztype) != IS_LONG) {
- convert_to_long_ex(ztype);
- }
-
- **types = Z_LVAL_PP(ztype);
- ++*types;
-
- if (*ztype != *(zval **)p) {
- zval_ptr_dtor(ztype);
- }
- return ZEND_HASH_APPLY_KEEP;
-}
-
-static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
-{
- char ***params;
- HashTable *zdtor;
- zval **zparam = p;
-
- params = (char ***) va_arg(argv, char ***);
- zdtor = (HashTable *) va_arg(argv, HashTable *);
-
- switch (Z_TYPE_PP(zparam)) {
- case IS_NULL:
- **params = NULL;
- ++*params;
- break;
-
- case IS_BOOL:
- **params = Z_BVAL_PP(zparam) ? "t" : "f";
- ++*params;
- break;
-
- 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 */
-
- 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;
- }
-
- return ZEND_HASH_APPLY_KEEP;
-}
-
-int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC)
-{
- int count = zend_hash_num_elements(ht);
-
- *types = NULL;
-
- if (count) {
- Oid *tmp;
-
- /* +1 for when less types than params are specified */
- *types = tmp = ecalloc(count + 1, sizeof(**types));
- zend_hash_apply_with_argument(ht, apply_to_oid, &tmp TSRMLS_CC);
- }
-
- return count;
-}
-
-int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC)
-{
- int count = zend_hash_num_elements(ht);
-
- *params = NULL;
-
- if (count) {
- char **tmp;
-
- *params = tmp = ecalloc(count, sizeof(char *));
- zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param, 2, &tmp, zdtor);
- }
-
- return count;
-}
-
-/*
-Oid *php_pq_ntypes_to_array(zend_bool fill, int argc, ...)
-{
- int i;
- Oid *oids = ecalloc(argc + 1, sizeof(*oids));
- va_list argv;
-
- va_start(argv, argc);
- for (i = 0; i < argc; ++i) {
- if (!fill || !i) {
- oids[i] = va_arg(argv, Oid);
- } else {
- oids[i] = oids[0];
- }
- }
- va_end(argv);
-
- return oids;
-}
-*/
-
zend_class_entry *php_pqdt_class_entry;
ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0)
return zv;
}
+zend_class_entry *php_pqconv_class_entry;
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_types, 0, 0, 0)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_from_string, 0, 0, 1)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0, 1)
+ ZEND_ARG_INFO(0, data)
+ZEND_END_ARG_INFO();
+
+zend_function_entry php_pqconv_methods[] = {
+ PHP_ABSTRACT_ME(pqconv, convertTypes, ai_pqconv_convert_types)
+ PHP_ABSTRACT_ME(pqconv, convertFromString, ai_pqconv_convert_from_string)
+ PHP_ABSTRACT_ME(pqconv, convertToString, ai_pqconv_convert_to_string)
+ {0}
+};
+
+
PHP_MINIT_FUNCTION(pq_misc)
{
zend_class_entry **json, ce = {0};
+ INIT_NS_CLASS_ENTRY(ce, "pq", "ConverterInterface", php_pqconv_methods);
+ php_pqconv_class_entry = zend_register_internal_interface(&ce TSRMLS_CC);
+
+ memset(&ce, 0, sizeof(ce));
INIT_NS_CLASS_ENTRY(ce ,"pq", "DateTime", php_pqdt_methods);
php_pqdt_class_entry = zend_register_internal_class_ex(&ce, php_date_get_date_ce(), "DateTime" TSRMLS_CC);
#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;
+ zelem = php_pq_typed_zval(el_str, el_len, a->typ TSRMLS_CC);
- case IS_DOUBLE:
- ZVAL_DOUBLE(zelem, dval);
- break;
-
- 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