#include <libpq-fe.h>
-/*
-#include <Zend/zend_interfaces.h>
-#include <Zend/zend_exceptions.h>
-#include <ext/spl/spl_array.h>
-#include <ext/spl/spl_exceptions.h>
-#include <ext/raphf/php_raphf.h>
-
-#include <libpq-events.h>
-#include <libpq/libpq-fs.h>
-#include <fnmatch.h>
-*/
-
#include "php_pq.h"
#include "php_pq_misc.h"
#include "php_pqcancel.h"
#include "php_pqconn.h"
#include "php_pqcopy.h"
+#include "php_pqcur.h"
#include "php_pqexc.h"
#include "php_pqlob.h"
#include "php_pqres.h"
PHP_MINIT_CALL(pqres);
PHP_MINIT_CALL(pqstm);
PHP_MINIT_CALL(pqtxn);
+ PHP_MINIT_CALL(pqcur);
PHP_MINIT_CALL(pqcopy);
PHP_MINIT_CALL(pqlob);
PHP_MSHUT_CALL(pqlob);
PHP_MSHUT_CALL(pqcopy);
+ PHP_MSHUT_CALL(pqcur);
PHP_MSHUT_CALL(pqtxn);
PHP_MSHUT_CALL(pqstm);
PHP_MSHUT_CALL(pqres);
php_info_print_table_start();
php_info_print_table_header(2, "PQ Support", "enabled");
- php_info_print_table_row(2, "Extension Version", PHP_PQ_EXT_VERSION);
+ php_info_print_table_row(2, "Extension Version", PHP_PQ_VERSION);
php_info_print_table_end();
php_info_print_table_start();
- php_info_print_table_header(2, "Used Library", "Version");
+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
#ifdef HAVE_PQLIBVERSION
libpq_v = PQlibVersion();
slprintf(libpq_version, sizeof(libpq_version), "%d.%d.%d", libpq_v/10000%100, libpq_v/100%100, libpq_v%100);
#endif
- php_info_print_table_row(2, "libpq", libpq_version);
+ php_info_print_table_row(3, "libpq", PHP_PQ_LIBVERSION, libpq_version);
php_info_print_table_end();
}
-const zend_function_entry pq_functions[] = {
+static const zend_function_entry pq_functions[] = {
{0}
};
static zend_module_dep pq_module_deps[] = {
ZEND_MOD_REQUIRED("raphf")
ZEND_MOD_REQUIRED("spl")
+ ZEND_MOD_OPTIONAL("json")
ZEND_MOD_END
};
NULL,/*PHP_RINIT(pq),*/
NULL,/*PHP_RSHUTDOWN(pq),*/
PHP_MINFO(pq),
- PHP_PQ_EXT_VERSION,
+ PHP_PQ_VERSION,
STANDARD_MODULE_PROPERTIES
};