X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=daf2c7947b92821ac0560a3e1b7ae3fdc77fcbe1;hp=4378404eb98ba3a9fcd6d8788f672473ff5bc7ba;hb=753359f19c5d29f08faca43ee735c49c217230a7;hpb=218002ba9087cf49f90e5f098f68a154d6092c78;ds=sidebyside

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index 4378404..daf2c79 100644
--- 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))) {
-		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) {
@@ -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) & 0x2; /* two bits only */
+	obj->intern->default_fetch_type = Z_LVAL_P(zft) & 0x3; /* two bits only */
 
 	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) & 0x2; /* two bits only */
+	obj->intern->default_txn_isolation = Z_LVAL_P(zti) & 0x3; /* two bits only */
 
 	if (zti != value) {
 		zval_ptr_dtor(&zti);
@@ -435,6 +435,36 @@ static void php_pqconn_object_write_def_txn_deferrable(zval *object, void *o, zv
 	obj->intern->default_txn_deferrable = zend_is_true(value);
 }
 
+static void php_pqconn_object_read_def_auto_conv(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+	php_pqconn_object_t *obj = o;
+
+	RETVAL_LONG(obj->intern->default_auto_convert);
+}
+static void php_pqconn_object_write_def_auto_conv(zval*object, void *o, zval *value TSRMLS_DC)
+{
+	php_pqconn_object_t *obj = o;
+	zval *zac = value;
+
+	if (Z_TYPE_P(zac) != IS_LONG) {
+		if (Z_REFCOUNT_P(zac) > 1) {
+			zval *tmp;
+			MAKE_STD_ZVAL(tmp);
+			ZVAL_ZVAL(tmp, zac, 1, 0);
+			convert_to_long(tmp);
+			zac = tmp;
+		} else {
+			convert_to_long_ex(&zac);
+		}
+	}
+
+	obj->intern->default_auto_convert = Z_LVAL_P(zac) & PHP_PQRES_CONV_ALL;
+
+	if (zac != value) {
+		zval_ptr_dtor(&zac);
+	}
+}
+
 static STATUS php_pqconn_update_socket(zval *this_ptr, php_pqconn_object_t *obj TSRMLS_DC)
 {
 	zval *zsocket, zmember;
@@ -511,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)
 {
-	// 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)
@@ -590,7 +625,6 @@ static void php_pqconn_retire(php_persistent_handle_factory_t *f, void **handle
 		zend_hash_apply_with_arguments(&evdata->obj->intern->listeners TSRMLS_CC, apply_unlisten, 1, evdata->obj);
 
 		/* release instance data */
-		//memset(evdata, 0, sizeof(*evdata));
 		efree(evdata);
 	}
 }
@@ -621,6 +655,8 @@ static PHP_METHOD(pqconn, __construct) {
 
 			obj->intern = ecalloc(1, sizeof(*obj->intern));
 
+			obj->intern->default_auto_convert = PHP_PQRES_CONV_ALL;
+
 			zend_hash_init(&obj->intern->listeners, 0, NULL, (dtor_func_t) zend_hash_destroy, 0);
 			zend_hash_init(&obj->intern->converters, 0, NULL, ZVAL_PTR_DTOR, 0);
 			zend_hash_init(&obj->intern->eventhandlers, 0, NULL, (dtor_func_t) zend_hash_destroy, 0);
@@ -1815,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_ARG_OBJ_INFO(0, converter, pq\\ConverterInterface, 0)
+	ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, setConverter) {
 	STATUS rv;
@@ -1846,7 +1882,7 @@ static PHP_METHOD(pqconn, setConverter) {
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unset_converter, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, converter, pq\\ConverterInterface, 0)
+	ZEND_ARG_OBJ_INFO(0, converter, pq\\Converter, 0)
 ZEND_END_ARG_INFO();
 static PHP_METHOD(pqconn, unsetConverter) {
 	STATUS rv;
@@ -2020,6 +2056,12 @@ PHP_MINIT_FUNCTION(pqconn)
 	zend_hash_add(&php_pqconn_object_prophandlers, "defaultTransactionDeferrable", sizeof("defaultTransactionDeferrable"), (void *) &ph, sizeof(ph), NULL);
 	ph.write = NULL;
 
+	zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("defaultAutoConvert"), PHP_PQRES_CONV_ALL, ZEND_ACC_PUBLIC TSRMLS_CC);
+	ph.read = php_pqconn_object_read_def_auto_conv;
+	ph.write = php_pqconn_object_write_def_auto_conv;
+	zend_hash_add(&php_pqconn_object_prophandlers, "defaultAutoConvert", sizeof("defaultAutoConvert"), (void *) &ph, sizeof(ph), NULL);
+	ph.write = NULL;
+
 	zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("OK"), CONNECTION_OK TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("BAD"), CONNECTION_BAD TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqconn_class_entry, ZEND_STRL("STARTED"), CONNECTION_STARTED TSRMLS_CC);