Skip to content
Browse files

Process list for PostgreSQL

  • Loading branch information...
1 parent 7f05e73 commit 06aa0f842b81982a6e6475d32de57d8adc36eb1f @juzna juzna committed with May 11, 2011
Showing with 27 additions and 9 deletions.
  1. +8 −1 adminer/drivers/mysql.inc.php
  2. +5 −1 adminer/drivers/pgsql.inc.php
  3. +11 −7 adminer/processlist.inc.php
  4. +3 −0 changes.txt
View
9 adminer/drivers/mysql.inc.php
@@ -902,6 +902,13 @@ function show_variables() {
return get_key_vals("SHOW VARIABLES");
}
+ /** Get process list
+ * @return array ($row)
+ */
+ function process_list() {
+ return get_rows("SHOW FULL PROCESSLIST");
+ }
+
/** Get status variables
* @return array ($name => $value)
*/
@@ -910,7 +917,7 @@ function show_status() {
}
/** Check whether a feature is supported
- * @param string "comment", "copy", "drop_col", "dump", "event", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "trigger", "type", "variables", "view"
+ * @param string "comment", "copy", "drop_col", "dump", "event", "kill", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "trigger", "type", "variables", "view"
* @return bool
*/
function support($feature) {
View
6 adminer/drivers/pgsql.inc.php
@@ -545,12 +545,16 @@ function use_sql($database) {
function show_variables() {
return get_key_vals("SHOW ALL");
}
+
+ function process_list() {
+ return get_rows("SELECT * FROM pg_stat_activity ORDER BY procpid");
+ }
function show_status() {
}
function support($feature) {
- return ereg('^(comment|view|scheme|sequence|trigger|type|variables|drop_col)$', $feature); //! routine|
+ return ereg('^(comment|view|scheme|processlist|sequence|trigger|type|variables|drop_col)$', $feature); //! routine|
}
$jush = "pgsql";
View
18 adminer/processlist.inc.php
@@ -1,5 +1,5 @@
<?php
-if ($_POST && !$error) {
+if (support("kill") && $_POST && !$error) {
$killed = 0;
foreach ((array) $_POST["kill"] as $val) {
if (queries("KILL " . (+$val))) {
@@ -16,20 +16,24 @@
<table cellspacing="0" onclick="tableClick(event);" class="nowrap">
<?php
$i = -1;
-foreach (get_rows("SHOW FULL PROCESSLIST") as $i => $row) {
+foreach (process_list() as $i => $row) {
if (!$i) {
- echo "<thead><tr lang='en'><th>&nbsp;<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
+ echo "<thead><tr lang='en'>" . (support("kill") ? "<th>&nbsp;" : "") . "<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
}
- echo "<tr" . odd() . "><td>" . checkbox("kill[]", $row["Id"], 0);
+ echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row["Id"], 0) : "");
foreach ($row as $key => $val) {
- echo "<td>" . ($key == "Info" && $val != "" ? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>' : nbsp($val));
+ echo "<td>" . (($jush == "sql" ? $key == "Info" && $val != "" : $key == "current_query" && $val != "<IDLE>") ? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>' : nbsp($val));
}
echo "\n";
}
?>
</table>
-<p><?php echo ($i + 1) . "/" . lang('%d in total', $connection->result("SELECT @@max_connections")); ?>
<p>
-<input type="submit" value="<?php echo lang('Kill'); ?>">
+<?php
+if (support("kill")) {
+ echo ($i + 1) . "/" . lang('%d in total', $connection->result("SELECT @@max_connections"));
+ echo "<p><input type='submit' value='" . lang('Kill') . "'>\n";
+}
+?>
<input type="hidden" name="token" value="<?php echo $token; ?>">
</form>
View
3 changes.txt
@@ -1,3 +1,6 @@
+Adminer 3.3.1-dev:
+Process list (PostgreSQL)
+
Adminer 3.3.0 (released 2011-07-19):
Use Esc to disable in-place edit
Shortcut for database privileges

0 comments on commit 06aa0f8

Please sign in to comment.
Something went wrong with that request. Please try again.