summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJehan-Guillaume (ioguix) de Rorthais2012-09-21 16:46:26 +0000
committerJehan-Guillaume (ioguix) de Rorthais2012-09-21 16:46:26 +0000
commitd571ecae7b73bb3bd1acdc2b84c230c9b623154c (patch)
tree6b96ac154e9ed8c2cdb05a81539752843b56b830
parentfa610be7d70d82aefdfc6d1f383dc95465a25863 (diff)
Fix bug with getProcesses with 9.2
-rwxr-xr-xclasses/database/Postgres.php11
-rwxr-xr-xclasses/database/Postgres91.php17
-rwxr-xr-xdatabase.php9
3 files changed, 21 insertions, 16 deletions
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 2027650c..d55762d6 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -7196,12 +7196,15 @@ class Postgres extends ADODB_base {
*/
function getProcesses($database = null) {
if ($database === null)
- $sql = "SELECT * FROM pg_catalog.pg_stat_activity ORDER BY datname, usename, pid";
+ $sql = "SELECT datname, usename, pid, query, query_start
+ 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, pid";
+ $sql = "SELECT datname, usename, pid, query, query_start
+ FROM pg_catalog.pg_stat_activity
+ WHERE datname='{$database}'
+ ORDER BY usename, pid";
}
return $this->selectSet($sql);
diff --git a/classes/database/Postgres91.php b/classes/database/Postgres91.php
index f7892cc2..07dda493 100755
--- a/classes/database/Postgres91.php
+++ b/classes/database/Postgres91.php
@@ -35,15 +35,20 @@ class Postgres91 extends Postgres {
*/
function getProcesses($database = null) {
if ($database === null)
- $sql = "SELECT * FROM pg_catalog.pg_stat_activity ORDER BY datname, usename, procpid";
+ $sql = "SELECT datname, usename, procpid AS pid, current_query AS query, query_start
+ 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";
+ //$this->clean($database);
+ $sql = "SELECT datname, usename, procpid AS pid, current_query AS query, query_start
+ FROM pg_catalog.pg_stat_activity
+ -- WHERE datname='{$database}'
+ ORDER BY usename, procpid";
}
- return $this->selectSet($sql);
+ $rc = $this->selectSet($sql);
+
+ return $rc;
}
// Tablespace functions
diff --git a/database.php b/database.php
index 4dec14ef..de82a505 100755
--- a/database.php
+++ b/database.php
@@ -435,7 +435,7 @@
// Fetch the processes from the database
echo "<h3>{$lang['strprocesses']}</h3>\n";
$processes = $data->getProcesses($_REQUEST['database']);
-
+
$columns = array(
'user' => array(
'title' => $lang['strusername'],
@@ -443,11 +443,11 @@
),
'process' => array(
'title' => $lang['strprocess'],
- 'field' => field('procpid'),
+ 'field' => field('pid'),
),
'query' => array(
'title' => $lang['strsql'],
- 'field' => field('current_query'),
+ 'field' => field('query'),
),
'start_time' => array(
'title' => $lang['strstarttime'],
@@ -496,9 +496,6 @@
if (count($actions) == 0) unset($columns['actions']);
- // Remove query start time for <7.4
- if (!isset($processes->fields['query_start'])) unset($columns['start_time']);
-
$misc->printTable($processes, $columns, $actions, 'database-processes', $lang['strnodata']);
if ($isAjax) exit;