php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Made pg_version() return full connection info.
This commit is contained in:
Yasuo Ohgaki
2014-01-14 10:16:43 +09:00
parent d599d36d49 58dff7cee5
commit 681e1a5ce0
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/pgsql/pgsql.c
View File

@@ -19,7 +19,7 @@
| Chris Kings-Lynne <chriskl@php.net> (v3 protocol) |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#include <stdlib.h>
@@ -1505,6 +1505,16 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type
#if HAVE_PQPARAMETERSTATUS
if (PQprotocolVersion(pgsql) >= 3) {
add_assoc_string(return_value, "server", (char*)PQparameterStatus(pgsql, "server_version"), 1);
add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1);
add_assoc_string(return_value, "application_name", (char*)PQparameterStatus(pgsql, "application_name"), 1);
add_assoc_string(return_value, "is_superuser", (char*)PQparameterStatus(pgsql, "is_superuser"), 1);
add_assoc_string(return_value, "session_authorization", (char*)PQparameterStatus(pgsql, "session_authorization"), 1);
add_assoc_string(return_value, "DateStyle", (char*)PQparameterStatus(pgsql, "DateStyle"), 1);
add_assoc_string(return_value, "IntervalStyle", (char*)PQparameterStatus(pgsql, "IntervalStyle"), 1);
add_assoc_string(return_value, "TimeZone", (char*)PQparameterStatus(pgsql, "TimeZone"), 1);
add_assoc_string(return_value, "integer_datetimes", (char*)PQparameterStatus(pgsql, "integer_datetimes"), 1);
add_assoc_string(return_value, "standard_conforming_strings", (char*)PQparameterStatus(pgsql, "standard_conforming_strings"), 1);
add_assoc_string(return_value, "server_encoding", (char*)PQparameterStatus(pgsql, "server_encoding"), 1);
}
#endif
#endif

20
ext/pgsql/tests/00version.phpt
View File

@@ -18,13 +18,31 @@ var_dump(serialize($_ENV));
echo "OK";
?>
--EXPECTF--
array(3) {
array(12) {
["client"]=>
string(%d) "%s"
["protocol"]=>
int(%d)
["server"]=>
string(%d) "%s"
["server_encoding"]=>
string(%d) "%s"
["application_name"]=>
string(0) ""
["is_superuser"]=>
string(%d) "%s"
["session_authorization"]=>
string(%d) "%s"
["DateStyle"]=>
string(%d) "%s"
["IntervalStyle"]=>
string(%d) "%s"
["TimeZone"]=>
string(%d) "%s"
["integer_datetimes"]=>
string(%d) "%s"
["standard_conforming_strings"]=>
string(%d) "%s"
}
string(%d) "%s"
OK