X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=2bc430c7c57202d3e5f45d765942034477de585a;hp=fdc03b2e4ece15a6cbea4aefe4778bc30c81559f;hb=da7b5981c5ae28504434c492d468913645111d66;hpb=88440266c0a9fa8354688b5ed0d2a6cc3bf04db5 diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c index fdc03b2..2bc430c 100644 --- a/src/php_pq_misc.c +++ b/src/php_pq_misc.c @@ -17,9 +17,6 @@ #include #include #include -#if defined(HAVE_JSON) && !defined(COMPILE_DL_JSON) -# include -#endif #include @@ -72,11 +69,13 @@ ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0) ZEND_END_ARG_INFO(); static PHP_METHOD(pqdt, __toString) { - zval *rv; + zval *rv = NULL; zend_call_method_with_1_params(&getThis(), php_pqdt_class_entry, NULL, "format", &rv, zend_read_property(php_pqdt_class_entry, getThis(), ZEND_STRL("format"), 0 TSRMLS_CC)); - RETVAL_ZVAL(rv, 1, 1); + if (rv) { + RETVAL_ZVAL(rv, 1, 1); + } } static zend_function_entry php_pqdt_methods[] = { @@ -105,17 +104,49 @@ zval *php_pqdt_from_string(char *dt_str, size_t dt_len, char *fmt, zval *zv TSRM return zv; } +void php_pqdt_to_string(zval *zdt, const char *format, char **str_buf, size_t *str_len TSRMLS_DC) +{ + zval rv; + + INIT_PZVAL(&rv); + ZVAL_NULL(&rv); + + if (Z_OBJ_HT_P(zdt)->cast_object + && SUCCESS == Z_OBJ_HT_P(zdt)->cast_object(zdt, &rv, IS_STRING TSRMLS_CC) + ) { + *str_len = Z_STRLEN(rv); + *str_buf = Z_STRVAL(rv); + } else if (instanceof_function(Z_OBJCE_P(zdt), php_date_get_date_ce() TSRMLS_CC)) { + zval *rv = NULL, *zfmt; + + MAKE_STD_ZVAL(zfmt); + ZVAL_STRING(zfmt, format, 1); + zend_call_method_with_1_params(&zdt, Z_OBJCE_P(zdt), NULL, "format", &rv, zfmt); + zval_ptr_dtor(&zfmt); + + if (rv) { + if (Z_TYPE_P(rv) == IS_STRING) { + *str_len = Z_STRLEN_P(rv); + *str_buf = estrndup(Z_STRVAL_P(rv), *str_len); + } + zval_ptr_dtor(&rv); + } + } +} + 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_BEGIN_ARG_INFO_EX(ai_pqconv_convert_from_string, 0, 0, 2) ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO(); -ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(ai_pqconv_convert_to_string, 0, 0, 2) ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) ZEND_END_ARG_INFO(); zend_function_entry php_pqconv_methods[] = { @@ -130,14 +161,14 @@ PHP_MINIT_FUNCTION(pq_misc) { zend_class_entry **json, ce = {0}; - INIT_NS_CLASS_ENTRY(ce, "pq", "ConverterInterface", php_pqconv_methods); + INIT_NS_CLASS_ENTRY(ce, "pq", "Converter", 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); - zend_declare_property_stringl(php_pqdt_class_entry, ZEND_STRL("format"), ZEND_STRL("Y-m-d H:i:s.u"), ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_stringl(php_pqdt_class_entry, ZEND_STRL("format"), ZEND_STRL("Y-m-d H:i:s.uO"), ZEND_ACC_PUBLIC TSRMLS_CC); /* stop reading this file right here! */ if (SUCCESS == zend_hash_find(CG(class_table), ZEND_STRS("jsonserializable"), (void *) &json)) { @@ -155,6 +186,7 @@ typedef struct _HashTableList { typedef struct _ArrayParserState { const char *ptr, *end; HashTableList *list; + php_pqres_t *res; #ifdef ZTS void ***ts; #endif @@ -201,7 +233,7 @@ static STATUS add_element(ArrayParserState *a, const char *start) MAKE_STD_ZVAL(zelem); ZVAL_NULL(zelem); } else { - zelem = php_pq_typed_zval(el_str, el_len, a->typ TSRMLS_CC); + zelem = php_pqres_typed_zval(a->res, el_str, el_len, a->typ TSRMLS_CC); efree(el_str); } @@ -328,7 +360,7 @@ static STATUS parse_array(ArrayParserState *a) return SUCCESS; } -HashTable *php_pq_parse_array(const char *val_str, size_t val_len, Oid typ TSRMLS_DC) +HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ TSRMLS_DC) { HashTable *ht = NULL; ArrayParserState a = {0}; @@ -337,6 +369,7 @@ HashTable *php_pq_parse_array(const char *val_str, size_t val_len, Oid typ TSRML a.typ = typ; a.ptr = val_str; a.end = val_str + val_len; + a.res = res; if (SUCCESS != parse_array(&a)) { while (a.list) { @@ -360,70 +393,6 @@ HashTable *php_pq_parse_array(const char *val_str, size_t val_len, Oid typ TSRML 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: