fprintf(stderr, "FREE stm(#%d) %p (conn(#%d): %p)\n", obj->zv.handle, obj, obj->intern->conn->zv.handle, obj->intern->conn);
#endif
if (obj->intern) {
- char *quoted_name = PQescapeIdentifier(obj->intern->conn->intern->conn, obj->intern->name, strlen(obj->intern->name));
+ if (obj->intern->conn->intern) {
+ char *quoted_name = PQescapeIdentifier(obj->intern->conn->intern->conn, obj->intern->name, strlen(obj->intern->name));
- php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
+ php_pq_callback_dtor(&obj->intern->conn->intern->onevent);
- if (quoted_name) {
- PGresult *res;
- smart_str cmd = {0};
+ if (quoted_name) {
+ PGresult *res;
+ smart_str cmd = {0};
- smart_str_appends(&cmd, "DEALLOCATE ");
- smart_str_appends(&cmd, quoted_name);
- smart_str_0(&cmd);
- PQfreemem(quoted_name);
+ smart_str_appends(&cmd, "DEALLOCATE ");
+ smart_str_appends(&cmd, quoted_name);
+ smart_str_0(&cmd);
+ PQfreemem(quoted_name);
- if ((res = PQexec(obj->intern->conn->intern->conn, cmd.c))) {
- PHP_PQclear(res);
+ if ((res = PQexec(obj->intern->conn->intern->conn, cmd.c))) {
+ PHP_PQclear(res);
+ }
+ smart_str_free(&cmd);
}
- smart_str_free(&cmd);
- }
- php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ php_pq_object_delref(obj->intern->conn TSRMLS_CC);
+ }
efree(obj->intern->name);
zend_hash_destroy(&obj->intern->bound);
if (obj->intern->params) {
ZEND_BEGIN_ARG_INFO_EX(ai_pqstm_construct, 0, 0, 3)
- ZEND_ARG_OBJ_INFO(0, Connection, pq\\Connection, 0)
+ ZEND_ARG_OBJ_INFO(0, connection, pq\\Connection, 0)
ZEND_ARG_INFO(0, name)
ZEND_ARG_INFO(0, query)
ZEND_ARG_ARRAY_INFO(0, types, 1)
php_pqstm_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
php_pqconn_object_t *conn_obj = zend_object_store_get_object(zconn TSRMLS_CC);
- if (!conn_obj->intern) {
+ if (obj->intern) {
+ throw_exce(EX_BAD_METHODCALL TSRMLS_CC, "pq\\Statement already initialized");
+ } else if (!conn_obj->intern) {
throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
} else {
php_pq_params_t *params = php_pq_params_init(&conn_obj->intern->converters, ztypes ? Z_ARRVAL_P(ztypes) : NULL, NULL TSRMLS_CC);
ZEND_END_ARG_INFO();
static PHP_METHOD(pqstm, bind) {
long param_no;
- zval *param_ref;
+ zval **param_ref;
zend_error_handling zeh;
STATUS rv;
zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
- rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz", ¶m_no, ¶m_ref);
+ rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lZ", ¶m_no, ¶m_ref);
zend_restore_error_handling(&zeh TSRMLS_CC);
if (SUCCESS == rv) {
if (!obj->intern) {
throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Statement not initialized");
} else {
- Z_ADDREF_P(param_ref);
- zend_hash_index_update(&obj->intern->bound, param_no, (void *) ¶m_ref, sizeof(zval *), NULL);
- zend_hash_sort(&obj->intern->bound, zend_qsort, compare_index, 0 TSRMLS_CC);
+ SEPARATE_ZVAL_TO_MAKE_IS_REF(param_ref);
+ Z_ADDREF_PP(param_ref);
+ zend_hash_index_update(&obj->intern->bound, param_no, (void *) param_ref, sizeof(zval *), NULL);
+ zend_hash_sort(&obj->intern->bound, zend_qsort, php_pq_compare_index, 0 TSRMLS_CC);
}
}
}
if (!rc) {
throw_exce(EX_IO TSRMLS_CC, "Failed to execute statement (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+#if HAVE_PQSETSINGLEROWMODE
} else if (obj->intern->conn->intern->unbuffered && !PQsetSingleRowMode(obj->intern->conn->intern->conn)) {
throw_exce(EX_RUNTIME TSRMLS_CC, "Failed to enable unbuffered mode (%s)", PHP_PQerrorMessage(obj->intern->conn->intern->conn));
+#endif
} else {
php_pq_callback_recurse(&obj->intern->conn->intern->onevent, &resolver TSRMLS_CC);
obj->intern->conn->intern->poller = PQconsumeInput;