pghero 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7180e123821d568de00ca057b46d552b04424cba
-  data.tar.gz: bcad3bb920aeeedf4958aaaa5a941d3e3af5724d
+  metadata.gz: 4c2d5754086d5f05286f922a611306630605f73b
+  data.tar.gz: ca7b5dcb1a2e9d58bd54c7aacd0e6994bfd7123e
 SHA512:
-  metadata.gz: 1e4eb14518cac12bced82d9ed97bd057be822f1d1f0f8d3ccd011f36f4b5658f749fd689de57ae4bec93433818b5fc9c9d917235b032ed26a7b5e6356557ea09
-  data.tar.gz: fad8fdc055de2709db694cfdc46be8f52ffe51565945a5e895e56ba9877450f31799af7199338001d61ac806fcaf34b0c7b0ec54a6974496f0db8f52e8353871
+  metadata.gz: c1dbde4deefd73421ffa1bb3f8f7bcb55026cd945b2c2ff9add537585d3169b01955c1e50140eec4356406aa1d7a17892b46eb6ca09b3523917b482dac41ad2e
+  data.tar.gz: 75c4b1ee8ddcf1d7153df87a1ff0aad0108bad8eded953061c342c66c01313d17f8ee3a19b28d37ef693b567c7dff90c8c111452e8a878d71a24ef5b56604975

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.2
+
+- Added support for PostgreSQL 9.6
+- Fixed incorrect query start for live queries in transactions
+
 ## 1.5.1
 
 - Better tune page for PostgreSQL 9.5

data/app/views/pg_hero/home/_live_queries_table.html.erb

@@ -1,21 +1,19 @@
 <table class="table queries">
   <thead>
     <tr>
-      <th style="width: 10%;">Pid</th>
-      <th style="width: 10%;">State</th>
-      <th style="width: 15%;">Duration</th>
-      <th>Source</th>
+      <th style="width: 25%;">Pid</th>
+      <th style="width: 25%;">Duration</th>
+      <th style="width: 25%;">State</th>
       <th style="width: 25%;"></th>
     </tr>
   </thead>
   <tbody>
     <% now = Time.now %>
-    <% queries.each do |query| %>
+    <% queries.reverse.each do |query| %>
       <tr>
         <td><%= query["pid"] %></td>
-        <td><%= query["state"] %></td>
         <td><%= query["started_at"] ? "#{number_with_delimiter(((now - Time.parse(query["started_at"])) * 1000).round)} ms" : nil %></td>
-        <td><%= query["source"] %> <span class="text-muted"><%= query["user"] %></span></td>
+        <td><%= query["state"] %></td>
         <td class="text-right">
           <% button_path, button_options = Rails.version >= "4.1" ? [explain_path, {params: {query: query["query"]}}] : [explain_path(query: query["query"]), {}] %>
           <%= button_to "Explain", button_path, button_options.merge(form: {target: "_blank"}, class: "btn btn-info") %>
@@ -23,7 +21,10 @@
         </td>
       </tr>
       <tr>
-        <td colspan="6" style="border-top: none; padding: 0;"><pre><%= query["query"] %></pre></td>
+        <td colspan="6" style="border-top: none; padding: 0;">
+          <%= query["source"] %> <span class="text-muted"><%= query["user"] %></span>
+          <pre><%= query["query"] %></pre>
+        </td>
       </tr>
     <% end %>
   </tbody>

data/guides/Linux.md

@@ -21,7 +21,7 @@ Ubuntu 14.04 (Trusty)
 wget -qO - https://deb.packager.io/key | sudo apt-key add -
 echo "deb https://deb.packager.io/gh/pghero/pghero trusty master" | sudo tee /etc/apt/sources.list.d/pghero.list
 sudo apt-get update
-sudo apt-get install pghero
+sudo apt-get -y install pghero
 ```
 
 Ubuntu 12.04 (Precise)
@@ -30,7 +30,7 @@ Ubuntu 12.04 (Precise)
 wget -qO - https://deb.packager.io/key | sudo apt-key add -
 echo "deb https://deb.packager.io/gh/pghero/pghero precise master" | sudo tee /etc/apt/sources.list.d/pghero.list
 sudo apt-get update
-sudo apt-get install pghero
+sudo apt-get -y install pghero
 ```
 
 Debian 7 (Wheezy)
@@ -39,16 +39,17 @@ Debian 7 (Wheezy)
 wget -qO - https://deb.packager.io/key | sudo apt-key add -
 echo "deb https://deb.packager.io/gh/pghero/pghero wheezy master" | sudo tee /etc/apt/sources.list.d/pghero.list
 sudo apt-get update
-sudo apt-get install pghero
+sudo apt-get -y install pghero
 ```
 
 Debian 8 (Jesse)
 
 ```sh
+sudo apt-get -y install apt-transport-https
 wget -qO - https://deb.packager.io/key | sudo apt-key add -
 echo "deb https://deb.packager.io/gh/pghero/pghero jessie master" | sudo tee /etc/apt/sources.list.d/pghero.list
 sudo apt-get update
-sudo apt-get install pghero
+sudo apt-get -y install pghero
 ```
 
 CentOS / RHEL 6

data/lib/pghero/methods/queries.rb

@@ -1,16 +1,17 @@
 module PgHero
   module Methods
     module Queries
-      def running_queries
+      def running_queries(options = {})
+        min_duration = options[:min_duration]
         select_all <<-SQL
           SELECT
             pid,
             state,
             application_name AS source,
-            age(now(), xact_start) AS duration,
-            waiting,
+            age(NOW(), COALESCE(query_start, xact_start)) AS duration,
+            #{server_version_num >= 90600 ? "(wait_event IS NOT NULL) AS waiting" : "waiting"},
             query,
-            xact_start AS started_at,
+            COALESCE(query_start, xact_start) AS started_at,
             usename AS user
           FROM
             pg_stat_activity
@@ -19,33 +20,14 @@ module PgHero
             AND state <> 'idle'
             AND pid <> pg_backend_pid()
             AND datname = current_database()
+            #{min_duration ? "AND NOW() - COALESCE(query_start, xact_start) > interval '#{min_duration.to_i} seconds'" : nil}
           ORDER BY
-            query_start DESC
+            COALESCE(query_start, xact_start) DESC
         SQL
       end
 
       def long_running_queries
-        select_all <<-SQL
-          SELECT
-            pid,
-            state,
-            application_name AS source,
-            age(now(), xact_start) AS duration,
-            waiting,
-            query,
-            xact_start AS started_at,
-            usename AS user
-          FROM
-            pg_stat_activity
-          WHERE
-            query <> '<insufficient privilege>'
-            AND state <> 'idle'
-            AND pid <> pg_backend_pid()
-            AND now() - query_start > interval '#{PgHero.long_running_query_sec.to_i} seconds'
-            AND datname = current_database()
-          ORDER BY
-            query_start DESC
-        SQL
+        running_queries(min_duration: PgHero.long_running_query_sec)
       end
 
       def slow_queries(options = {})

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord