From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 20 Oct 2012 16:58:56 +0000 (-0700)
Subject: Fix process list in PostgreSQL 9.2
X-Git-Tag: v3.6.2~22
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=0408c21d070cfb5436798d26a1396d6ee042faf8;p=adminer.git

Fix process list in PostgreSQL 9.2
---

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index f589a621..150c6470 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -574,7 +574,8 @@ AND typelem = 0"
 	}
 
 	function process_list() {
-		return get_rows("SELECT * FROM pg_stat_activity ORDER BY procpid");
+		global $connection;
+		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . ($connection->server_info < 9.2 ? "procpid" : "pid"));
 	}
 	
 	function show_status() {
diff --git a/changes.txt b/changes.txt
index 474b6f9a..4f3dc09c 100644
--- a/changes.txt
+++ b/changes.txt
@@ -4,6 +4,7 @@ Don't select row on double click
 Shorten values in varchar fields
 Display table default values on wide screens
 Fix switching language on first load
+PostgreSQL: Fix process list in version 9.2
 
 Adminer 3.6.1 (released 2012-09-17):
 Fix compiled version on PHP with multibyte support