]> granicus.if.org Git - php/commitdiff
Implement Request #47570 libpq's PG_VERSION should be exported to userland
authorYasuo Ohgaki <yohgaki@ohgaki.net>
Fri, 30 Mar 2012 00:45:33 +0000 (09:45 +0900)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 10:20:35 +0000 (12:20 +0200)
ext/pgsql/pgsql.c

index d8127af8c107b5050945c731ae70107f0affbfb5..54a86a827610c16d50c4799bc0bdfadaabb92309 100644 (file)
@@ -934,6 +934,11 @@ PHP_MINIT_FUNCTION(pgsql)
        le_result = zend_register_list_destructors_ex(_free_result, NULL, "pgsql result", module_number);
        le_lofp = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql large object", module_number);
        le_string = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql string", module_number);
+#if HAVE_PG_CONFIG_H
+       /* PG_VERSION - libpq version */
+       REGISTER_STRING_CONSTANT("PGSQL_LIBPQ_VERSION", PG_VERSION, CONST_CS | CONST_PERSISTENT);
+       REGISTER_STRING_CONSTANT("PGSQL_LIBPQ_VERSION_STR", PG_VERSION_STR, CONST_CS | CONST_PERSISTENT);
+#endif
        /* For connection option */
        REGISTER_LONG_CONSTANT("PGSQL_CONNECT_FORCE_NEW", PGSQL_CONNECT_FORCE_NEW, CONST_CS | CONST_PERSISTENT);
        /* For pg_fetch_array() */
@@ -1048,6 +1053,7 @@ PHP_MINFO_FUNCTION(pgsql)
        php_info_print_table_header(2, "PostgreSQL Support", "enabled");
 #if HAVE_PG_CONFIG_H
        php_info_print_table_row(2, "PostgreSQL(libpq) Version", PG_VERSION);
+       php_info_print_table_row(2, "PostgreSQL(libpq) ", PG_VERSION_STR);
 #ifdef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT
        php_info_print_table_row(2, "Multibyte character support", "enabled");
 #else