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

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index dedd1f4..b978bb0 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);
@@ -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);
@@ -1851,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;
@@ -1882,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;
@@ -1970,7 +1970,7 @@ PHP_MINIT_FUNCTION(pqconn)
 	php_pqconn_object_handlers.get_properties = php_pq_object_properties;
 	php_pqconn_object_handlers.get_debug_info = php_pq_object_debug_info;
 
-	zend_hash_init(&php_pqconn_object_prophandlers, 14, NULL, NULL, 1);
+	zend_hash_init(&php_pqconn_object_prophandlers, 19, NULL, NULL, 1);
 
 	zend_declare_property_long(php_pqconn_class_entry, ZEND_STRL("status"), CONNECTION_BAD, ZEND_ACC_PUBLIC TSRMLS_CC);
 	ph.read = php_pqconn_object_read_status;