pghero 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1584095de5f97c95ab55a592deb44aa7eea06e35
-  data.tar.gz: 356b2efd8d8996b4e45378d9a840772413cb688e
+  metadata.gz: eb291e1e354b3844fd5d54ff4894fb841054a272
+  data.tar.gz: cdc3dcdb41c9fd5f11f945fb127c3e5ab64eedf2
 SHA512:
-  metadata.gz: 2756d1a94611279615cd3362311cd7cf3aee45a610323137b902eca674a6ed7176ebcdfd8a96c7a92392fb48fceb0464f37c5cc21583343eb1aee75156300843
-  data.tar.gz: ea0b4eb73f5cb3ca170808e75021c808bd61d0ae5be36e99e89c86af8fd3f913236eaf87aabc8fc8afe61f10e7407599356ed9163b0e50d7b16d2d172d8561aa
+  metadata.gz: 345b0973aa418742ce6b8624112a1e7a3b67dcb9910c5749c7217e4a6cc029d16dac0b42b66bf0fff4863ee413738a2212f4b155ab7e5cdc40beac5ec1283bda
+  data.tar.gz: c28162b603ffe0ae7a7c7040eeefec7a9a0880d0f9c185fa16f18bd605894b71387c669795fb0a862bcc2614dd30b8a0e60c0dd2cdc283dc2da95bf38fca1bf6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.6.4
+
+- Only show connection charts if there are connections
+- Fixed duplicate indexes for multiple schemas
+- Fixed display issue for queries without word break
+- Removed maintenance tab for replicas
+
 ## 1.6.3
 
 - Added 10 second timeout for explain

data/app/assets/stylesheets/pghero/application.css

@@ -30,6 +30,7 @@ table {
   border-collapse: collapse;
   border-spacing: 0;
   margin-bottom: 20px;
+  table-layout: fixed;
 }
 
 th {

data/app/views/layouts/pg_hero/application.html.erb

@@ -39,7 +39,9 @@
             <li class="<%= controller.action_name == "space" ? "active" : "" %>"><%= link_to "Space", space_path %></li>
             <li class="<%= controller.action_name == "connections" ? "active" : "" %>"><%= link_to "Connections", connections_path %></li>
             <li class="<%= controller.action_name == "live_queries" ? "active" : "" %>"><%= link_to "Live Queries", live_queries_path %></li>
-            <li class="<%= controller.action_name == "maintenance" ? "active" : "" %>"><%= link_to "Maintenance", maintenance_path %></li>
+            <% unless @database.replica? %>
+              <li class="<%= controller.action_name == "maintenance" ? "active" : "" %>"><%= link_to "Maintenance", maintenance_path %></li>
+            <% end %>
             <li class="<%= controller.action_name == "explain" ? "active" : "" %>"><%= link_to "Explain", explain_path %></li>
             <li class="<%= controller.action_name == "tune" ? "active" : "" %>"><%= link_to "Tune", tune_path %></li>
           </ul>

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

@@ -3,31 +3,33 @@
 
   <p><%= pluralize(@total_connections, "connection") %></p>
 
-  <h3>By Database</h3>
-
-  <% top_connections = Hash.new(0) %>
-  <% @connection_sources.each do |source| %>
-    <% top_connections[source["database"]] += source["total_connections"].to_i %>
+  <% if @total_connections > 0 %>
+    <h3>By Database</h3>
+
+    <% top_connections = Hash.new(0) %>
+    <% @connection_sources.each do |source| %>
+      <% top_connections[source["database"]] += source["total_connections"].to_i %>
+    <% end %>
+    <% top_connections = top_connections.sort_by { |k, v| [-v, k] } %>
+
+    <div id="chart-1" class="chart" style="height: 260px; line-height: 260px; margin-bottom: 20px;">Loading...</div>
+    <script>
+      new Chartkick.PieChart("chart-1", <%= json_escape(top_connections.to_json).html_safe %>);
+    </script>
+
+    <h3>By User</h3>
+
+    <% top_connections = Hash.new(0) %>
+    <% @connection_sources.each do |source| %>
+      <% top_connections[source["user"]] += source["total_connections"].to_i %>
+    <% end %>
+    <% top_connections = top_connections.sort_by { |k, v| [-v, k] } %>
+
+    <div id="chart-2" class="chart" style="height: 260px; line-height: 260px; margin-bottom: 20px;">Loading...</div>
+    <script>
+      new Chartkick.PieChart("chart-2", <%= json_escape(top_connections.to_json).html_safe %>);
+    </script>
+
+    <%= render partial: "connections_table", locals: {connection_sources: @connection_sources} %>
   <% end %>
-  <% top_connections = top_connections.sort_by { |k, v| [-v, k] } %>
-
-  <div id="chart-1" class="chart" style="height: 260px; line-height: 260px; margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.PieChart("chart-1", <%= json_escape(top_connections.to_json).html_safe %>);
-  </script>
-
-  <h3>By User</h3>
-
-  <% top_connections = Hash.new(0) %>
-  <% @connection_sources.each do |source| %>
-    <% top_connections[source["user"]] += source["total_connections"].to_i %>
-  <% end %>
-  <% top_connections = top_connections.sort_by { |k, v| [-v, k] } %>
-
-  <div id="chart-2" class="chart" style="height: 260px; line-height: 260px; margin-bottom: 20px;">Loading...</div>
-  <script>
-    new Chartkick.PieChart("chart-2", <%= json_escape(top_connections.to_json).html_safe %>);
-  </script>
-
-  <%= render partial: "connections_table", locals: {connection_sources: @connection_sources} %>
 </div>

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

@@ -23,7 +23,5 @@
     <% end %>
   <% elsif @error %>
     <div class="alert alert-danger"><%= @error %></div>
-  <% else %>
-    <p class="text-muted">Note: The analyze and visualize buttons can add load to your database for long running queries, so be careful.</p>
   <% end %>
 </div>

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

@@ -21,7 +21,7 @@
           <td>
             <% time = [table["last_autovacuum"], table["last_vacuum"]].compact.max %>
             <% if time %>
-              <%= @time_zone.parse(time).strftime("%m/%-e %l:%M %P") %>
+              <%= @time_zone.parse(time).strftime("%-m/%-e %l:%M %P") %>
             <% else %>
               <span class="text-muted">Unknown</span>
             <% end %>
@@ -29,7 +29,7 @@
           <td>
             <% time = [table["last_autoanalyze"], table["last_analyze"]].compact.max %>
             <% if time %>
-              <%= @time_zone.parse(time).strftime("%m/%-e %l:%M %P") %>
+              <%= @time_zone.parse(time).strftime("%-m/%-e %l:%M %P") %>
             <% else %>
               <span class="text-muted">Unknown</span>
             <% end %>

data/lib/pghero/methods/indexes.rb

@@ -114,22 +114,25 @@ module PgHero
       def indexes
         select_all(<<-SQL
           SELECT
+            schemaname AS schema,
             t.relname AS table,
             ix.relname AS name,
-            regexp_replace(pg_get_indexdef(indexrelid), '^[^\\(]*\\((.*)\\)$', '\\1') AS columns,
-            regexp_replace(pg_get_indexdef(indexrelid), '.* USING ([^ ]*) \\(.*', '\\1') AS using,
+            regexp_replace(pg_get_indexdef(i.indexrelid), '^[^\\(]*\\((.*)\\)$', '\\1') AS columns,
+            regexp_replace(pg_get_indexdef(i.indexrelid), '.* USING ([^ ]*) \\(.*', '\\1') AS using,
             indisunique AS unique,
             indisprimary AS primary,
             indisvalid AS valid,
             indexprs::text,
             indpred::text,
-            pg_get_indexdef(indexrelid) AS definition
+            pg_get_indexdef(i.indexrelid) AS definition
           FROM
             pg_index i
           INNER JOIN
             pg_class t ON t.oid = i.indrelid
           INNER JOIN
             pg_class ix ON ix.oid = i.indexrelid
+          LEFT JOIN
+            pg_stat_user_indexes ui ON ui.indexrelid = i.indexrelid
           ORDER BY
             1, 2
         SQL
@@ -141,7 +144,7 @@ module PgHero
 
         indexes_by_table = self.indexes.group_by { |i| i["table"] }
         indexes_by_table.values.flatten.select { |i| PgHero.falsey?(i["primary"]) && PgHero.falsey?(i["unique"]) && !i["indexprs"] && !i["indpred"] && PgHero.truthy?(i["valid"]) }.each do |index|
-          covering_index = indexes_by_table[index["table"]].find { |i| index_covers?(i["columns"], index["columns"]) && i["using"] == index["using"] && i["name"] != index["name"] && !i["indexprs"] && !i["indpred"] && PgHero.truthy?(i["valid"]) }
+          covering_index = indexes_by_table[index["table"]].find { |i| index_covers?(i["columns"], index["columns"]) && i["using"] == index["using"] && i["name"] != index["name"] && i["schema"] == index["schema"] && !i["indexprs"] && !i["indpred"] && PgHero.truthy?(i["valid"]) }
           if covering_index && (covering_index["columns"] != index["columns"] || index["name"] > covering_index["name"])
             indexes << {"unneeded_index" => index, "covering_index" => covering_index}
           end

data/lib/pghero/methods/replica.rb

@@ -2,7 +2,10 @@ module PgHero
   module Methods
     module Replica
       def replica?
-        select_all("SELECT setting FROM pg_settings WHERE name = 'hot_standby'").first["setting"] == "on"
+        unless defined?(@replica)
+          @replica = select_all("SELECT setting FROM pg_settings WHERE name = 'hot_standby'").first["setting"] == "on"
+        end
+        @replica
       end
 
       # http://www.postgresql.org/message-id/CADKbJJWz9M0swPT3oqe8f9+tfD4-F54uE6Xtkh4nERpVsQnjnw@mail.gmail.com

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord