X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_misc.c;h=df07591570153603be6137d5ec62634abc15ecda;hp=8c7ec6b241bc988cb667ce938c8efd6fc9183a3f;hb=5ba3107011d4050d5ae5877dae80e382dc228e6a;hpb=17e6dcce1f6176f0c428e14964bf8320f1de2779 diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c index 8c7ec6b..df07591 100644 --- a/src/php_pq_misc.c +++ b/src/php_pq_misc.c @@ -16,18 +16,70 @@ #include #include -#if defined(HAVE_JSON) && !defined(COMPILE_DL_JSON) -# include -#endif +#include #include #include #include "php_pq.h" +#include "php_pqexc.h" #include "php_pq_misc.h" +#include "php_pqconn_event.h" +#undef PHP_PQ_TYPE +#include "php_pq_type.h" + + +/* clear result object associated with a result handle */ +void php_pqres_clear(PGresult *r) { + php_pq_object_t *o = PQresultInstanceData(r, php_pqconn_event); + + if (o) { + php_pq_object_delref(o); + } else { + PQclear(r); + } +} -char *rtrim(char *e) +/* clear any asynchronous results */ +void php_pqconn_clear(PGconn *conn) { + PGresult *r; + php_pqconn_event_data_t *evdata = PQinstanceData(conn, php_pqconn_event); + + while ((r = PQgetResult(conn))) { + php_pqres_clear(r); + } + + if (evdata && evdata->obj) { + if (php_pq_callback_is_enabled(&evdata->obj->intern->onevent)) { + if (php_pq_callback_is_locked(&evdata->obj->intern->onevent)) { + php_pq_callback_disable(&evdata->obj->intern->onevent); + } else { + php_pq_callback_dtor(&evdata->obj->intern->onevent); + } + } + } +} + +/* safe wrappers to clear any asynchronous wrappers before querying synchronously */ +PGresult *php_pq_exec(PGconn *conn, const char *query) { + php_pqconn_clear(conn); + return PQexec(conn, query); +} +PGresult *php_pq_exec_params(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) { + php_pqconn_clear(conn); + return PQexecParams(conn, command, nParams, paramTypes, paramValues, paramLengths, paramFormats, resultFormat); +} +PGresult *php_pq_prepare(PGconn *conn, const char *stmtName, const char *query, int nParams, const Oid *paramTypes) { + php_pqconn_clear(conn); + return PQprepare(conn, stmtName, query, nParams, paramTypes); +} +PGresult *php_pq_exec_prepared(PGconn *conn, const char *stmtName, int nParams, const char *const * paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) { + php_pqconn_clear(conn); + return PQexecPrepared(conn, stmtName, nParams, paramValues, paramLengths, paramFormats, resultFormat); +} + +char *php_pq_rtrim(char *e) { size_t l = strlen(e); @@ -37,7 +89,7 @@ char *rtrim(char *e) return e; } -const char *strmode(long mode) +const char *php_pq_strmode(long mode) { switch (mode & (INV_READ|INV_WRITE)) { case INV_READ|INV_WRITE: @@ -51,191 +103,365 @@ const char *strmode(long mode) } } -int compare_index(const void *lptr, const void *rptr TSRMLS_DC) +int php_pq_compare_index(const void *lptr, const void *rptr) { - const Bucket *l = *(const Bucket **) lptr; - const Bucket *r = *(const Bucket **) rptr; + zend_ulong l = ((const Bucket *) lptr)->h; + zend_ulong r = ((const Bucket *) rptr)->h; - if (l->h < r->h) { + if (l < r) { return -1; } - if (l->h > r->h) { + if (l > r) { return 1; } return 0; } -static int apply_to_oid(void *p, void *arg TSRMLS_DC) +void php_pq_hash_ptr_dtor(zval *p) { - Oid **types = arg; - zval **ztype = p; + efree(Z_PTR_P(p)); +} - if (Z_TYPE_PP(ztype) != IS_LONG) { - convert_to_long_ex(ztype); - } +zend_class_entry *php_pqdt_class_entry; + +ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0) +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqdt, __toString) +{ + zval rv, tmp; - **types = Z_LVAL_PP(ztype); - ++*types; + ZVAL_NULL(&rv); + 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, &tmp)); + RETVAL_ZVAL(&rv, 1, 1); +} - if (*ztype != *(zval **)p) { - zval_ptr_dtor(ztype); +ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, datetime) +#if PHP_VERSION_ID >= 70200 + ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1) +#else + ZEND_ARG_INFO(0, timezone) +#endif +ZEND_END_ARG_INFO(); +static PHP_METHOD(pqdt, createFromFormat) +{ + zend_error_handling zeh; + char *fmt_str, *dt_str; + size_t fmt_len, dt_len; + zval *ztz = NULL; + ZEND_RESULT_CODE rv; + + zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh); + rv = zend_parse_parameters(ZEND_NUM_ARGS(), "ss|O", &fmt_str, &fmt_len, &dt_str, &dt_len, &ztz, php_date_get_timezone_ce()); + zend_restore_error_handling(&zeh); + + if (SUCCESS == rv) { + php_pqdt_from_string(return_value, fmt_str, dt_str, dt_len, "Y-m-d H:i:s.uO", ztz); } - return ZEND_HASH_APPLY_KEEP; } -static int apply_to_param(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key) +static zend_function_entry php_pqdt_methods[] = { + PHP_ME(pqdt, createFromFormat, ai_pqdt_create_from_format, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + PHP_ME(pqdt, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) + PHP_MALIAS(pqdt, jsonSerialize, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) + {0} +}; + +zval *php_pqdt_from_string(zval *zv, char *input_fmt, char *dt_str, size_t dt_len, char *output_fmt, zval *ztimezone) { - char ***params; - HashTable *zdtor; - zval **zparam = p; + php_date_obj *dobj; - params = (char ***) va_arg(argv, char ***); - zdtor = (HashTable *) va_arg(argv, HashTable *); + php_date_instantiate(php_pqdt_class_entry, zv); + dobj = php_date_obj_from_obj(Z_OBJ_P(zv)); + if (!php_date_initialize(dobj, dt_str, dt_len, input_fmt, ztimezone, 1)) { + zval_dtor(zv); + ZVAL_NULL(zv); + } else if (output_fmt) { + zend_update_property_string(php_pqdt_class_entry, zv, ZEND_STRL("format"), output_fmt); + } - switch (Z_TYPE_PP(zparam)) { - case IS_NULL: - **params = NULL; - ++*params; - break; + return zv; +} - case IS_BOOL: - **params = Z_BVAL_PP(zparam) ? "t" : "f"; - ++*params; - break; +zend_string *php_pqdt_to_string(zval *zdt, const char *format) +{ + zval rv; - 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 */ + ZVAL_NULL(&rv); - default: - convert_to_string_ex(zparam); - /* no break */ + if (Z_OBJ_HT_P(zdt)->cast_object + && SUCCESS == Z_OBJ_HT_P(zdt)->cast_object(zdt, &rv, IS_STRING) + ) { + return Z_STR(rv); + } else if (instanceof_function(Z_OBJCE_P(zdt), php_date_get_date_ce())) { + zval rv, zfmt; - case IS_STRING: - **params = Z_STRVAL_PP(zparam); - ++*params; + ZVAL_NULL(&rv); + ZVAL_STRING(&zfmt, format); + zend_call_method_with_1_params(zdt, Z_OBJCE_P(zdt), NULL, "format", &rv, &zfmt); + zval_ptr_dtor(&zfmt); - if (*zparam != *(zval **)p) { - zend_hash_next_index_insert(zdtor, zparam, sizeof(zval *), NULL); + if (Z_TYPE(rv) == IS_STRING) { + return Z_STR(rv); } - break; + zval_ptr_dtor(&rv); } - return ZEND_HASH_APPLY_KEEP; + return NULL; } -int php_pq_types_to_array(HashTable *ht, Oid **types TSRMLS_DC) +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, 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, 2) + ZEND_ARG_INFO(0, data) + ZEND_ARG_INFO(0, type) +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) { - int count = zend_hash_num_elements(ht); + zend_class_entry *json, ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "pq", "Converter", php_pqconv_methods); + php_pqconv_class_entry = zend_register_internal_interface(&ce); - *types = NULL; + 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()); - if (count) { - Oid *tmp; + zend_declare_property_stringl(php_pqdt_class_entry, ZEND_STRL("format"), ZEND_STRL("Y-m-d H:i:s.uO"), ZEND_ACC_PUBLIC); - /* +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); + /* stop reading this file right here! */ + if ((json = zend_hash_str_find_ptr(CG(class_table), ZEND_STRL("jsonserializable")))) { + zend_class_implements(php_pqdt_class_entry, 1, json); } - return count; + return SUCCESS; } -int php_pq_params_to_array(HashTable *ht, char ***params, HashTable *zdtor TSRMLS_DC) +typedef struct _HashTableList { + zval arr; + struct _HashTableList *parent; +} HashTableList; + +typedef struct _ArrayParserState { + const char *ptr, *end; + HashTableList *list; + php_pqres_t *res; + Oid typ; + unsigned quotes:1; + unsigned escaped:1; +} ArrayParserState; + +static char caa(ArrayParserState *a, const char *any, unsigned advance) { - int count = zend_hash_num_elements(ht); + const char *p = any; - *params = NULL; + do { + if (*p == *a->ptr) { + a->ptr += advance; + return *p; + } + } while (*++p); - if (count) { - char **tmp; + php_error_docref(NULL, E_WARNING, "Failed to parse array: expected one of '%s', got '%c'", any, *a->ptr); \ + return 0; +} - *params = tmp = ecalloc(count, sizeof(char *)); - zend_hash_apply_with_arguments(ht TSRMLS_CC, apply_to_param, 2, &tmp, zdtor); +static ZEND_RESULT_CODE add_element(ArrayParserState *a, const char *start) +{ + zval zelem; + zend_string *zstr = zend_string_init(start, a->ptr - start, 0); + + if (a->quotes) { + php_stripslashes(zstr); + ZVAL_STR(&zelem, zstr); + } else if (!zend_string_equals_literal(zstr, "NULL")) { + ZVAL_STR(&zelem, zstr); + } else { + zend_string_release(zstr); + ZVAL_NULL(&zelem); + } + + if (!ZVAL_IS_NULL(&zelem)) { + php_pqres_typed_zval(a->res, a->typ, &zelem); } - return count; + add_next_index_zval(&a->list->arr, &zelem); + return SUCCESS; } -/* -Oid *php_pq_ntypes_to_array(zend_bool fill, int argc, ...) +static ZEND_RESULT_CODE parse_array(ArrayParserState *a); + +static ZEND_RESULT_CODE parse_element(ArrayParserState *a, char delim) { - 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]; + const char *el; + + switch (*a->ptr) { + case '{': + return parse_array(a); + + case '"': + a->quotes = 1; + ++a->ptr; + break; + } + + for (el = a->ptr; a->ptr < a->end; ++a->ptr) { + switch (*a->ptr) { + case '\\': + a->escaped = !a->escaped; + break; + + case '"': + if (a->escaped) { + a->escaped = 0; + } else if (a->quotes) { + if (SUCCESS != add_element(a, el)) { + return FAILURE; + } + a->quotes = 0; + ++a->ptr; + return SUCCESS; + } else { + php_error_docref(NULL, E_WARNING, "Failed to parse element, unexpected quote: '%.*s'", (int) (a->ptr - el), el); + return FAILURE; + } + break; + + default: + if (delim != *a->ptr) { + a->escaped = 0; + break; + } + /* no break */ + case '}': + if (!a->quotes) { + return add_element(a, el); + } + break; + } } - va_end(argv); - return oids; + php_error_docref(NULL, E_WARNING, "Failed to parse element, reached end of input"); + return FAILURE; } -*/ - -zend_class_entry *php_pqdt_class_entry; -ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_to_string, 0, 0, 0) -ZEND_END_ARG_INFO(); -static PHP_METHOD(pqdt, __toString) +static ZEND_RESULT_CODE parse_elements(ArrayParserState *a) { - zval *rv; + char delims[] = {'}', (char) PHP_PQ_DELIM_OF_ARRAY(a->typ), 0}; + + while (SUCCESS == parse_element(a, delims[1])) { + switch (caa(a, delims, 0)) { + case 0: + return FAILURE; + + case '}': + return SUCCESS; + + default: + if (!*++a->ptr) { + php_error_docref(NULL, E_WARNING, "Failed to parse elements, reached end of input"); + return FAILURE; + } + break; + } + } - 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); + return FAILURE; } -static zend_function_entry php_pqdt_methods[] = { - PHP_ME(pqdt, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) - PHP_MALIAS(pqdt, jsonSerialize, __toString, ai_pqdt_to_string, ZEND_ACC_PUBLIC) - {0} -}; - -zval *php_pqdt_from_string(char *dt_str, size_t dt_len, char *fmt, zval *zv TSRMLS_DC) +static ZEND_RESULT_CODE parse_array(ArrayParserState *a) { - php_date_obj *dobj; + HashTableList *list; - if (!zv) { - MAKE_STD_ZVAL(zv); + if (!caa(a, "{", 1)) { + return FAILURE; } - php_date_instantiate(php_pqdt_class_entry, zv TSRMLS_CC); - dobj = zend_object_store_get_object(zv TSRMLS_CC); - if (!php_date_initialize(dobj, dt_str, dt_len, NULL, NULL, 1 TSRMLS_CC)) { - zval_dtor(zv); - ZVAL_NULL(zv); - } else if (fmt) { - zend_update_property_string(php_pqdt_class_entry, zv, ZEND_STRL("format"), fmt TSRMLS_CC); + list = ecalloc(1, sizeof(*list)); + array_init(&list->arr); + + if (a->list) { + add_next_index_zval(&a->list->arr, &list->arr); + list->parent = a->list; } + a->list = list; - return zv; + if (SUCCESS != parse_elements(a)) { + return FAILURE; + } + + if (!caa(a, "}", 1)) { + return FAILURE; + } + + /* step one level back up */ + if (a->list->parent) { + HashTableList *l = a->list->parent; + + efree(a->list); + a->list = l; + } + + return SUCCESS; } -PHP_MINIT_FUNCTION(pq_misc) +HashTable *php_pq_parse_array(php_pqres_t *res, const char *val_str, size_t val_len, Oid typ) { - zend_class_entry **json, ce = {0}; + HashTable *ht = NULL; + ArrayParserState a = {0}; - 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); + a.typ = typ; + a.ptr = val_str; + a.end = val_str + val_len; + a.res = res; - 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); + if (SUCCESS != parse_array(&a)) { + while (a.list) { + HashTableList *l = a.list->parent; - /* stop reading this file right here! */ - if (SUCCESS == zend_hash_find(CG(class_table), ZEND_STRS("jsonserializable"), (void *) &json)) { - zend_class_implements(php_pqdt_class_entry TSRMLS_CC, 1, *json); + zval_dtor(&a.list->arr); + efree(a.list); + a.list = l; + } + return ht; } - return SUCCESS; + if (*a.ptr) { + php_error_docref(NULL, E_NOTICE, "Trailing input: '%s'", a.ptr); + } + + while (a.list) { + HashTableList *l = a.list->parent; + + ht = Z_ARRVAL(a.list->arr); + efree(a.list); + a.list = l; + } + + return ht; } + /* * Local variables: * tab-width: 4