X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqconn.c;h=7b1fbd926d49e7e2f32150449d4c2ccfc77f83c5;hp=b65023ce9fea366e7109aa2320b5531544176c61;hb=a840b29b5fc3f841f39acd1ae47e957d7db29583;hpb=f1cfd1b4749640a7a18cd865c36e4b1ac0f31596

diff --git a/src/php_pqconn.c b/src/php_pqconn.c
index b65023c..7b1fbd9 100644
--- a/src/php_pqconn.c
+++ b/src/php_pqconn.c
@@ -301,6 +301,25 @@ static void php_pqconn_object_read_port(zval *object, void *o, zval *return_valu
 	}
 }
 
+static void php_pqconn_object_read_params(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+	php_pqconn_object_t *obj = o;
+	PQconninfoOption *ptr, *params = PQconninfo(obj->intern->conn);
+
+	array_init(return_value);
+
+	if (params) {
+		for (ptr = params; ptr->keyword; ++ptr) {
+			if (ptr->val) {
+				add_assoc_string(return_value, ptr->keyword, ptr->val, 1);
+			} else {
+				add_assoc_null(return_value, ptr->keyword);
+			}
+		}
+		PQconninfoFree(params);
+	}
+}
+
 static void php_pqconn_object_read_options(zval *object, void *o, zval *return_value TSRMLS_DC)
 {
 	php_pqconn_object_t *obj = o;
@@ -1343,24 +1362,6 @@ static PHP_METHOD(pqconn, prepareAsync) {
 	}
 }
 
-static inline char *declare_str(const char *name_str, size_t name_len, unsigned flags, const char *query_str, size_t query_len)
-{
-	size_t decl_len = name_len + query_len + sizeof("DECLARE BINARY INSENSITIVE NO SCROLL  CURSOR WITHOUT HOLD FOR ");
-	char *decl_str;
-
-	decl_str = emalloc(decl_len);
-	decl_len = slprintf(decl_str, decl_len, "DECLARE %s %s %s %s CURSOR %s FOR %s",
-			name_str,
-			(flags & PHP_PQ_DECLARE_BINARY) ? "BINARY" : "",
-			(flags & PHP_PQ_DECLARE_INSENSITIVE) ? "INSENSITIVE" : "",
-			(flags & PHP_PQ_DECLARE_NO_SCROLL) ? "NO SCROLL" :
-					(flags & PHP_PQ_DECLARE_SCROLL) ? "SCROLL" : "",
-			(flags & PHP_PQ_DECLARE_WITH_HOLD) ? "WITH HOLD" : "",
-			query_str
-	);
-	return decl_str;
-}
-
 STATUS php_pqconn_declare(zval *object, php_pqconn_object_t *obj, const char *decl TSRMLS_DC)
 {
 	PGresult *res;
@@ -1406,7 +1407,7 @@ static PHP_METHOD(pqconn, declare) {
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
-			char *decl = declare_str(name_str, name_len, flags, query_str, query_len);
+			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len);
 
 			if (SUCCESS != php_pqconn_declare(getThis(), obj, decl TSRMLS_CC)) {
 				efree(decl);
@@ -1471,7 +1472,7 @@ static PHP_METHOD(pqconn, declareAsync) {
 		if (!obj->intern) {
 			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Connection not initialized");
 		} else {
-			char *decl = declare_str(name_str, name_len, flags, query_str, query_len);
+			char *decl = php_pqcur_declare_str(name_str, name_len, flags, query_str, query_len);
 
 			if (SUCCESS != php_pqconn_declare_async(getThis(), obj, decl TSRMLS_CC)) {
 				efree(decl);
@@ -1989,7 +1990,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, 19, NULL, NULL, 1);
+	zend_hash_init(&php_pqconn_object_prophandlers, 20, 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;
@@ -2043,6 +2044,10 @@ PHP_MINIT_FUNCTION(pqconn)
 	ph.read = php_pqconn_object_read_port;
 	zend_hash_add(&php_pqconn_object_prophandlers, "port", sizeof("port"), (void *) &ph, sizeof(ph), NULL);
 
+	zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("params"), ZEND_ACC_PUBLIC TSRMLS_CC);
+	ph.read = php_pqconn_object_read_params;
+	zend_hash_add(&php_pqconn_object_prophandlers, "params", sizeof("params"), (void *) &ph, sizeof(ph), NULL);
+
 	zend_declare_property_null(php_pqconn_class_entry, ZEND_STRL("options"), ZEND_ACC_PUBLIC TSRMLS_CC);
 	ph.read = php_pqconn_object_read_options;
 	zend_hash_add(&php_pqconn_object_prophandlers, "options", sizeof("options"), (void *) &ph, sizeof(ph), NULL);