projects
/
m6w6
/
ext-pq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update from docs
[m6w6/ext-pq]
/
src
/
php_pqconn.c
diff --git
a/src/php_pqconn.c
b/src/php_pqconn.c
index 2588d42f0fb09d9739f072bce180503b7630bb70..daf2c7947b92821ac0560a3e1b7ae3fdc77fcbe1 100644
(file)
--- a/
src/php_pqconn.c
+++ b/
src/php_pqconn.c
@@
-219,7
+219,7
@@
static void php_pqconn_object_write_encoding(zval *object, void *o, zval *value
}
if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
}
if (0 > PQsetClientEncoding(obj->intern->conn, Z_STRVAL_P(zenc))) {
-
zend
_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
+
php
_error(E_NOTICE, "Unrecognized encoding '%s'", Z_STRVAL_P(zenc));
}
if (zenc != value) {
}
if (zenc != value) {
@@
-372,7
+372,7
@@
static void php_pqconn_object_write_def_fetch_type(zval *object, void *o, zval *
}
}
}
}
- obj->intern->default_fetch_type = Z_LVAL_P(zft) & 0x
2
; /* two bits only */
+ obj->intern->default_fetch_type = Z_LVAL_P(zft) & 0x
3
; /* two bits only */
if (zft != value) {
zval_ptr_dtor(&zft);
if (zft != value) {
zval_ptr_dtor(&zft);
@@
-402,7
+402,7
@@
static void php_pqconn_object_write_def_txn_isolation(zval *object, void *o, zva
}
}
}
}
- obj->intern->default_txn_isolation = Z_LVAL_P(zti) & 0x
2
; /* two bits only */
+ obj->intern->default_txn_isolation = Z_LVAL_P(zti) & 0x
3
; /* two bits only */
if (zti != value) {
zval_ptr_dtor(&zti);
if (zti != value) {
zval_ptr_dtor(&zti);
@@
-458,7
+458,7
@@
static void php_pqconn_object_write_def_auto_conv(zval*object, void *o, zval *va
}
}
}
}
- obj->intern->default_auto_convert = Z_LVAL_P(zac) &
0xff
;
+ obj->intern->default_auto_convert = Z_LVAL_P(zac) &
PHP_PQRES_CONV_ALL
;
if (zac != value) {
zval_ptr_dtor(&zac);
if (zac != value) {
zval_ptr_dtor(&zac);
@@
-541,7
+541,12
@@
php_resource_factory_ops_t *php_pqconn_get_resource_factory_ops(void)
static void php_pqconn_wakeup(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC)
{
static void php_pqconn_wakeup(php_persistent_handle_factory_t *f, void **handle TSRMLS_DC)
{
- // FIXME: ping server
+ PGresult *res = PQexec(*handle, "");
+ PHP_PQclear(res);
+
+ if (CONNECTION_OK != PQstatus(*handle)) {
+ PQreset(*handle);
+ }
}
static inline PGresult *unlisten(PGconn *conn, const char *channel_str, size_t channel_len TSRMLS_DC)
}
static inline PGresult *unlisten(PGconn *conn, const char *channel_str, size_t channel_len TSRMLS_DC)
@@
-1846,7
+1851,7
@@
static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_h
}
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_set_converter, 0, 0, 1)
}
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_set_converter, 0, 0, 1)
- ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter
Interface
, 0)
+ ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, setConverter) {
STATUS rv;
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, setConverter) {
STATUS rv;
@@
-1877,7
+1882,7
@@
static PHP_METHOD(pqconn, setConverter) {
}
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unset_converter, 0, 0, 1)
}
ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unset_converter, 0, 0, 1)
- ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter
Interface
, 0)
+ ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, unsetConverter) {
STATUS rv;
ZEND_END_ARG_INFO();
static PHP_METHOD(pqconn, unsetConverter) {
STATUS rv;