} else {
PGresult *res;
- if ((res = PQexec(obj->intern->conn->intern->conn, smart_str_v(&cmd)))) {
- PHP_PQclear(res);
+ if ((res = php_pq_exec(obj->intern->conn->intern->conn, smart_str_v(&cmd)))) {
+ php_pqres_clear(res);
} else if (!silent) {
throw_exce(EX_RUNTIME, "Failed to deallocate statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
}
}
obj->intern->allocated = 0;
+ zend_hash_str_del(&obj->intern->conn->intern->statements, obj->intern->name, strlen(obj->intern->name));
}
}
ZEND_INIT_SYMTABLE(&stm->bound);
+ zend_hash_str_add_ptr(&conn->intern->statements, name, strlen(name), stm);
+
return stm;
}
PGresult *res;
php_pq_params_set_params(obj->intern->params, zparams ? Z_ARRVAL_P(zparams) : &obj->intern->bound);
- res = PQexecPrepared(obj->intern->conn->intern->conn, obj->intern->name, obj->intern->params->param.count, (const char *const*) obj->intern->params->param.strings, NULL, NULL, 0);
+ res = php_pq_exec_prepared(obj->intern->conn->intern->conn, obj->intern->name, obj->intern->params->param.count, (const char *const*) obj->intern->params->param.strings, NULL, NULL, 0);
php_pq_params_set_params(obj->intern->params, NULL);
if (!res) {
add_next_index_long(return_value, PQparamtype(res, p));
}
}
- PHP_PQclear(res);
+ php_pqres_clear(res);
php_pqconn_notify_listeners(obj->intern->conn);
}
}
php_pqstm_deallocate_handler(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
}
-static zend_always_inline void php_pqstm_prepare_handler(INTERNAL_FUNCTION_PARAMETERS, zend_bool async)
+static inline void php_pqstm_prepare_handler(INTERNAL_FUNCTION_PARAMETERS, zend_bool async)
{
zend_error_handling zeh;
ZEND_RESULT_CODE rv;
if (SUCCESS == rv) {
obj->intern->allocated = 1;
+
+ zend_hash_str_add_ptr(&obj->intern->conn->intern->statements,
+ obj->intern->name, strlen(obj->intern->name), obj->intern);
}
}
}
}
static zend_function_entry php_pqstm_methods[] = {
- PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+ PHP_ME(pqstm, __construct, ai_pqstm_construct, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, bind, ai_pqstm_bind, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, deallocate, ai_pqstm_deallocate, ZEND_ACC_PUBLIC)
PHP_ME(pqstm, deallocateAsync, ai_pqstm_deallocate_async, ZEND_ACC_PUBLIC)
php_pqstm_object_handlers.read_property = php_pq_object_read_prop;
php_pqstm_object_handlers.write_property = php_pq_object_write_prop;
php_pqstm_object_handlers.clone_obj = NULL;
- php_pqstm_object_handlers.get_property_ptr_ptr = NULL;
+ php_pqstm_object_handlers.get_property_ptr_ptr = php_pq_object_get_prop_ptr_null;
php_pqstm_object_handlers.get_gc = php_pq_object_get_gc;
php_pqstm_object_handlers.get_properties = php_pq_object_properties;
php_pqstm_object_handlers.get_debug_info = php_pq_object_debug_info;