X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=dedd1f4c4a41701e59ce6ed05a820dbd9eeb7a8f;hp=e730dcdb56cd3d40842b55ab0f56ffe25b8ca4a6;hb=6dc0521ba88d2dbf4ac0ca773b0726ebc2b998a7;hpb=d613997b3072b8093bca3fe9d8aca115e2a579aa

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index e730dcd..dedd1f4 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -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) & 0xff;
+
+	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);
@@ -1798,12 +1834,17 @@ static int apply_set_converter(void *p TSRMLS_DC, int argc, va_list argv, zend_h
 {
 	zval *tmp, **zoid = p, **zcnv = va_arg(argv, zval **);
 	HashTable *converters = va_arg(argv, HashTable *);
+	int add = va_arg(argv, int);
 
 	tmp = *zoid;
 	Z_ADDREF_P(tmp);
 	convert_to_long_ex(&tmp);
-	Z_ADDREF_PP(zcnv);
-	zend_hash_index_update(converters, Z_LVAL_P(tmp), zcnv, sizeof(zval *), NULL);
+	if (add) {
+		Z_ADDREF_PP(zcnv);
+		zend_hash_index_update(converters, Z_LVAL_P(tmp), zcnv, sizeof(zval *), NULL);
+	} else {
+		zend_hash_index_del(converters, Z_LVAL_P(tmp));
+	}
 	zval_ptr_dtor(&tmp);
 
 	return ZEND_HASH_APPLY_KEEP;
@@ -1833,7 +1874,38 @@ static PHP_METHOD(pqconn, setConverter) {
 			tmp = zoids;
 			Z_ADDREF_P(tmp);
 			convert_to_array_ex(&tmp);
-			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 2, &zcnv, &obj->intern->converters);
+			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 3, &zcnv, &obj->intern->converters, 1);
+			zval_ptr_dtor(&tmp);
+			zval_ptr_dtor(&zoids);
+		}
+	}
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_pqconn_unset_converter, 0, 0, 1)
+	ZEND_ARG_OBJ_INFO(0, converter, pq\\ConverterInterface, 0)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqconn, unsetConverter) {
+	STATUS rv;
+	zend_error_handling zeh;
+	zval *zcnv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zcnv, php_pqconv_class_entry);
+	zend_restore_error_handling(&zeh TSRMLS_CC);
+
+	if (SUCCESS == rv) {
+		php_pqconn_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		if (!obj->intern) {
+			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
+		} else {
+			zval *tmp, *zoids = NULL;
+
+			zend_call_method_with_0_params(&zcnv, NULL, NULL, "converttypes", &zoids);
+			tmp = zoids;
+			Z_ADDREF_P(tmp);
+			convert_to_array_ex(&tmp);
+			zend_hash_apply_with_arguments(Z_ARRVAL_P(tmp) TSRMLS_CC, apply_set_converter, 3, &zcnv, &obj->intern->converters, 0);
 			zval_ptr_dtor(&tmp);
 			zval_ptr_dtor(&zoids);
 		}
@@ -1870,6 +1942,7 @@ static zend_function_entry php_pqconn_methods[] = {
 	PHP_ME(pqconn, off, ai_pqconn_off, ZEND_ACC_PUBLIC)
 	PHP_ME(pqconn, on, ai_pqconn_on, ZEND_ACC_PUBLIC)
 	PHP_ME(pqconn, setConverter, ai_pqconn_set_converter, ZEND_ACC_PUBLIC)
+	PHP_ME(pqconn, unsetConverter, ai_pqconn_unset_converter, ZEND_ACC_PUBLIC)
 	{0}
 };
 
@@ -1983,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);