summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJehan-Guillaume (ioguix) de Rorthais2012-08-24 16:00:33 +0000
committerJehan-Guillaume (ioguix) de Rorthais2012-08-24 16:00:33 +0000
commit6174e7932907140a424fb2faed4095e40bb5e9b0 (patch)
tree120f9e45c5f4491ea395398da87274f48807d74d
parent8091c46457d136e9e53c4fb0024903f5717112cb (diff)
Fix on the processes page with 9.2
Field pg_catalog.pg_stat_activity.procpid is renamed as pid in 9.2
-rwxr-xr-xclasses/database/Postgres.php4
-rwxr-xr-xclasses/database/Postgres91.php19
2 files changed, 21 insertions, 2 deletions
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 0421989f..2027650c 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -7196,12 +7196,12 @@ class Postgres extends ADODB_base {
*/
function getProcesses($database = null) {
if ($database === null)
- $sql = "SELECT * FROM pg_catalog.pg_stat_activity ORDER BY datname, usename, procpid";
+ $sql = "SELECT * FROM pg_catalog.pg_stat_activity ORDER BY datname, usename, pid";
else {
$this->clean($database);
$sql = "
SELECT * FROM pg_catalog.pg_stat_activity
- WHERE datname='{$database}' ORDER BY usename, procpid";
+ WHERE datname='{$database}' ORDER BY usename, pid";
}
return $this->selectSet($sql);
diff --git a/classes/database/Postgres91.php b/classes/database/Postgres91.php
index 613beca8..f7892cc2 100755
--- a/classes/database/Postgres91.php
+++ b/classes/database/Postgres91.php
@@ -27,6 +27,25 @@ class Postgres91 extends Postgres {
return $this->help_page;
}
+ // Administration functions
+ /**
+ * Returns all available process information.
+ * @param $database (optional) Find only connections to specified database
+ * @return A recordset
+ */
+ function getProcesses($database = null) {
+ if ($database === null)
+ $sql = "SELECT * FROM pg_catalog.pg_stat_activity ORDER BY datname, usename, procpid";
+ else {
+ $this->clean($database);
+ $sql = "
+ SELECT * FROM pg_catalog.pg_stat_activity
+ WHERE datname='{$database}' ORDER BY usename, procpid";
+ }
+
+ return $this->selectSet($sql);
+ }
+
// Tablespace functions
/**