X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqtypes.c;h=e1d22ad0a9679bea94f18f9ec054613c9d100152;hp=ef169d36556020525fb4969fa4af15ce8189c3fc;hb=8897b5a581a86279a2ee371784b6b7670c8b8cc1;hpb=1e2615005272bb2347820bccb38c94b9caccafb8

diff --git a/src/php_pqtypes.c b/src/php_pqtypes.c
index ef169d3..e1d22ad 100644
--- a/src/php_pqtypes.c
+++ b/src/php_pqtypes.c
@@ -181,8 +181,7 @@ static PHP_METHOD(pqtypes, __construct) {
 #define PHP_PQ_TYPES_QUERY \
 	"select t.oid, t.* " \
 	"from pg_type t join pg_namespace n on t.typnamespace=n.oid " \
-	"where typisdefined " \
-	"and typrelid=0"
+	"where typisdefined"
 #ifndef PHP_PQ_OID_TEXT
 # define PHP_PQ_OID_TEXT 25
 #endif
@@ -230,17 +229,17 @@ static PHP_METHOD(pqtypes, refresh) {
 			PGresult *res;
 
 			if (!nsp || !zend_hash_num_elements(nsp)) {
-				res = PQexec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY " and nspname in ('public', 'pg_catalog')");
+				res = php_pq_exec(obj->intern->conn->intern->conn, PHP_PQ_TYPES_QUERY " and nspname in ('public', 'pg_catalog')");
 			} else {
 				smart_str str = {0};
 				php_pq_params_t *params = php_pq_params_init(&obj->intern->conn->intern->converters, NULL, NULL);
 
 				smart_str_appends(&str, PHP_PQ_TYPES_QUERY " and nspname in(");
-				zend_hash_apply_with_arguments(nsp TSRMLS_CC, apply_nsp, 2, params, &str);
+				zend_hash_apply_with_arguments(nsp, apply_nsp, 2, params, &str);
 				smart_str_appendc(&str, ')');
 				smart_str_0(&str);
 
-				res = PQexecParams(obj->intern->conn->intern->conn, smart_str_v(&str), params->param.count, params->type.oids, (const char *const*) params->param.strings, NULL, NULL, 0);
+				res = php_pq_exec_params(obj->intern->conn->intern->conn, smart_str_v(&str), params->param.count, params->type.oids, (const char *const*) params->param.strings, NULL, NULL, 0);
 
 				smart_str_free(&str);
 				php_pq_params_free(&params);
@@ -264,7 +263,7 @@ static PHP_METHOD(pqtypes, refresh) {
 					}
 				}
 
-				PHP_PQclear(res);
+				php_pqres_clear(res);
 				php_pqconn_notify_listeners(obj->intern->conn);
 			}
 		}
@@ -272,7 +271,7 @@ static PHP_METHOD(pqtypes, refresh) {
 }
 
 static zend_function_entry php_pqtypes_methods[] = {
-	PHP_ME(pqtypes, __construct, ai_pqtypes_construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+	PHP_ME(pqtypes, __construct, ai_pqtypes_construct, ZEND_ACC_PUBLIC)
 	PHP_ME(pqtypes, refresh, ai_pqtypes_refresh, ZEND_ACC_PUBLIC)
 	{0}
 };
@@ -293,7 +292,7 @@ PHP_MINIT_FUNCTION(pqtypes)
 	php_pqtypes_class_entry->create_object = php_pqtypes_create_object;
 
 	/*
-	zend_class_implements(php_pqtypes_class_entry TSRMLS_CC, 1, zend_ce_arrayaccess);
+	zend_class_implements(php_pqtypes_class_entry, 1, zend_ce_arrayaccess);
 	*/
 
 	memcpy(&php_pqtypes_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));