pghero 3.5.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c69fbbfe2cc6c474e61c2350f2e2b70670b0c28c17146ed7393ae6e2ebba518
-  data.tar.gz: 2496d325e1b0a32adcd301ba87bd272ae06e4f14a98537f36302f89f4d627fa1
+  metadata.gz: a7dc52d94fbdd96a3efcef37d4739855cb5e9ab0da76c53d345141c3a0f28021
+  data.tar.gz: 6e1640fb5ff339f5d0523d7acebb4655c0426b877a2a6545e53fb0af386769da
 SHA512:
-  metadata.gz: 1fe1bef91fee759752b2217f3ffcf3f47eba8f5f05b21d5a9e2ad3e4955316c7d88c4b735219d917a7c776a0e71ca12653ed1e79d610d367df8241d7a5893779
-  data.tar.gz: ecdbb066253e1d49a5f1ec8c987675b6c46ca7a139b6ca1b4a3110588cb22dd56101182a65c92b3727d64b9b61358c1d8014c9231a5326a311f40c6c15cea186
+  metadata.gz: d1ad10cfe918c2ab278af7aa96fcf5b08ccce3b6454f9630d7a628c9be0d54d0d3f5110d9ec4ab9248ee42556bba66166347412d284074820ed35069292ce72f
+  data.tar.gz: 4a7cc686fb1074c827a21e5b9ee8ce5a82119926b05e9ea8cdacd31759765932767df2638bd0790543e5f252507c97863c9572be7112be22244927396d93dce7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.6.1 (2024-10-14)
+
+- Fixed error when Propshaft is installed but not used
+
+## 3.6.0 (2024-07-10)
+
+- Improved CSP support
+- Dropped support for Linux packages for Ubuntu 18.04, CentOS 7, and SLES 12
+- Dropped support for Ruby < 3.1 and Rails < 6.1
+
 ## 3.5.0 (2024-05-21)
 
 - Added materialized views to space page and `relation_sizes` method

data/app/assets/javascripts/pghero/application.js

@@ -157,3 +157,17 @@ function initSlider() {
     refreshStats(false);
   });
 }
+
+$(document).on("click", ".query-code", function () {
+  this.style.maxHeight = "none";
+});
+
+$(document).on("click", ".migration-link", function (e) {
+  e.preventDefault();
+  $(this).parent().next(".migration").css("display", "block");
+});
+
+$(document).on("click", ".show-details", function () {
+  $(this).nextAll(".details").css("display", "block");
+  $(this).css("display", "none");
+});

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

@@ -483,12 +483,12 @@ body {
   line-height: 300px;
   text-align: center;
   color: #999;
+  margin-bottom: 20px;
 }
 
 .pie-chart {
   height: 260px;
   line-height: 260px;
-  margin-bottom: 20px;
 }
 
 .unused-index {
@@ -503,8 +503,18 @@ body {
   font-weight: bold;
 }
 
+.origins-table {
+  table-layout: auto;
+}
+
 .origin {
   word-break: break-word;
+  width: 90%;
+}
+
+.origin-pct {
+  text-align: right;
+  width: 10%;
 }
 
 .duplicate-indexes td {
@@ -518,3 +528,93 @@ body {
 .no-outline:focus {
   outline: none;
 }
+
+.width-10 {
+  width: 10%;
+}
+
+.width-15 {
+  width: 15%;
+}
+
+.width-20 {
+  width: 20%;
+}
+
+.width-25 {
+  width: 25%;
+}
+
+.width-33 {
+  width: 33.33%;
+}
+
+.right-5 {
+  margin-right: 5px;
+}
+
+.query-row {
+  border-top: none;
+  padding: 0;
+}
+
+.query-pre {
+  margin-top: 1em;
+}
+
+.query-code {
+  max-height: 230px;
+  overflow: hidden;
+}
+
+.break-all {
+  word-break: break-all;
+}
+
+.migration {
+  display: none;
+}
+
+.migration pre {
+  overflow: scroll;
+  white-space: pre;
+  word-break: normal;
+}
+
+.space-index {
+  font-style: italic;
+}
+
+a.relation-link {
+  color: inherit;
+}
+
+.push-left {
+  float: left;
+}
+
+.clear-both {
+  clear: both;
+}
+
+.create-index {
+  color: #eee;
+  background-color: #333;
+}
+
+.hide {
+  display: none;
+}
+
+.show-details {
+  float: right;
+  color: #f0ad4e;
+  margin-top: 0px;
+  padding: 10px;
+  cursor: pointer;
+}
+
+.details pre {
+  color: #f0ad4e;
+  background-color: #333;
+}

data/app/controllers/pg_hero/home_controller.rb

@@ -166,6 +166,8 @@ module PgHero
 
       if !@historical_query_stats_enabled || request.xhr?
         set_suggested_indexes
+      else
+        @debug = params[:debug].present?
       end
 
       # fix back button issue with caching
@@ -274,7 +276,7 @@ module PgHero
 
     def free_space_stats
       render json: [
-        {name: "Free Space", data: @database.free_space_stats(duration: 14.days, period: 1.hour), library: chart_library_options},
+        {name: "Free Space", data: @database.free_space_stats(duration: 14.days, period: 1.hour), library: chart_library_options}
       ]
     end
 

data/app/helpers/pg_hero/home_helper.rb

@@ -5,7 +5,7 @@ module PgHero
       if schema && schema != "public"
         ident = "#{schema}.#{table}"
       end
-      if ident =~ /\A[a-z0-9_]+\z/
+      if /\A[a-z0-9_]+\z/.match?(ident)
         ident
       else
         @database.quote_ident(ident)

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

@@ -5,12 +5,12 @@
 
     <meta charset="utf-8" />
     <%= favicon_link_tag "pghero/favicon.png" %>
-    <% if defined?(Propshaft::Railtie) %>
+    <% if defined?(Propshaft::Railtie) && Rails.application.assets.is_a?(Propshaft::Assembly) %>
       <%= stylesheet_link_tag "pghero/nouislider", "pghero/arduino-light", "pghero/application" %>
-      <%= javascript_include_tag "pghero/jquery", "pghero/nouislider", "pghero/Chart.bundle", "pghero/chartkick", "pghero/highlight.min", "pghero/application" %>
+      <%= javascript_include_tag "pghero/jquery", "pghero/nouislider", "pghero/Chart.bundle", "pghero/chartkick", "pghero/highlight.min", "pghero/application", nonce: true %>
     <% else %>
       <%= stylesheet_link_tag "pghero/application" %>
-      <%= javascript_include_tag "pghero/application" %>
+      <%= javascript_include_tag "pghero/application", nonce: true %>
     <% end %>
   </head>
   <body>

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

@@ -2,7 +2,7 @@
   <thead>
     <tr>
       <th>Top Sources</th>
-      <th style="width: 20%;">Connections</th>
+      <th class="width-20">Connections</th>
     </tr>
   </thead>
   <tbody>

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

@@ -1,10 +1,10 @@
 <table class="table queries">
   <thead>
     <tr>
-      <th style="width: 25%;">Pid</th>
-      <th style="width: 25%;">Duration</th>
-      <th style="width: 25%;">State</th>
-      <th style="width: 25%;"></th>
+      <th class="width-25">Pid</th>
+      <th class="width-25">Duration</th>
+      <th class="width-25">State</th>
+      <th class="width-25"></th>
     </tr>
   </thead>
   <tbody>
@@ -39,15 +39,15 @@
         </td>
       </tr>
       <tr>
-        <td colspan="6" style="border-top: none; padding: 0;">
+        <td colspan="4" class="query-row">
           <%= query[:source] %> <span class="text-muted"><%= query[:user] %></span>
-          <pre style="margin-top: 1em;"><code><%= query[:query] %></code></pre>
+          <pre class="query-pre"><code><%= query[:query] %></code></pre>
         </td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
-<script>
+<%= javascript_tag nonce: true do %>
   highlightQueries();
-</script>
+<% end %>

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

@@ -2,9 +2,9 @@
   <% unless local_assigns[:xhr] %>
     <thead>
       <tr>
-        <th style="width: 33.33%;"><%= local_assigns[:sort_headers] ? link_to("Total Time", {sort: nil}, data: {sort: nil}) : "Total Time" %></th>
-        <th style="width: 33.33%;"><%= local_assigns[:sort_headers] ? link_to("Average Time", {sort: "average_time"}, data: {sort: "average_time"}) : "Average Time" %></th>
-        <th style="width: 33.33%;"><%= local_assigns[:sort_headers] ? link_to("Calls", {sort: "calls"}, data: {sort: "calls"}) : "Calls" %></th>
+        <th class="width-33"><%= local_assigns[:sort_headers] ? link_to("Total Time", {sort: nil}, data: {sort: nil}) : "Total Time" %></th>
+        <th class="width-33"><%= local_assigns[:sort_headers] ? link_to("Average Time", {sort: "average_time"}, data: {sort: "average_time"}) : "Average Time" %></th>
+        <th class="width-33"><%= local_assigns[:sort_headers] ? link_to("Calls", {sort: "calls"}, data: {sort: "calls"}) : "Calls" %></th>
       </tr>
     </thead>
   <% end %>
@@ -57,8 +57,8 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" style="border-top: none; padding: 0;">
-          <pre><code style="max-height: 230px; overflow: hidden;" onclick="this.style.maxHeight = 'none';"><%= query[:query] %></code></pre>
+        <td colspan="3" class="query-row">
+          <pre><code class="query-code"><%= query[:query] %></code></pre>
           <% if query[:query] == "<insufficient privilege>" %>
             <p class="text-muted">For security reasons, only superusers can see queries executed by other users.</p>
           <% end %>

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

@@ -4,7 +4,7 @@
   <div id="range-start"></div>
 </div>
 
-<script>
+<%= javascript_tag nonce: true do %>
   var sort = <%= pghero_js_value(@sort) %>;
   var minAverageTime = <%= pghero_js_value(@min_average_time) %>;
   var minCalls = <%= pghero_js_value(@min_calls) %>;
@@ -13,4 +13,4 @@
   var endAt = <%= pghero_js_value(@end_at.to_i * 1000) %>;
 
   initSlider();
-</script>
+<% end %>

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

@@ -1,13 +1,14 @@
 <% if index && !details[:covering_index] %>
   <% unless @debug %>
-    <div style="float: right; color: #f0ad4e; margin-top: 0px; padding: 10px; cursor: pointer;" onclick="document.getElementById('details-<%= index.object_id %>').style.display = 'block'; this.style.display = 'none';">Details</div>
+    <div class="show-details">Details</div>
   <% end %>
-  <code><pre style="color: #eee; background-color: #333;">CREATE INDEX CONCURRENTLY ON <%= index[:table] %><% if index[:using] %> USING <%= index[:using] %><% end %> (<%= index[:columns].join(", ") %>)</pre></code>
+  <code><pre class="create-index">CREATE INDEX CONCURRENTLY ON <%= index[:table] %><% if index[:using] %> USING <%= index[:using] %><% end %> (<%= index[:columns].join(", ") %>)</pre></code>
 <% end %>
-<div id="details-<%= index.object_id %>" style="<%= "display: none;" unless @debug %>">
-  <code><pre style="color: #f0ad4e; background-color: #333;"><% if details[:explanation] %><%= details[:explanation] %>
+<div class="details<%= " hide" unless @debug %>">
+  <code><pre><% if details[:explanation] %><%= details[:explanation] %>
 <% end %><% if details[:row_estimates] %>Rows: <%= details[:rows] %>
-Row progression: <%= details[:row_progression].to_a.join(", ") %>
+<% if details[:row_progression] %>Row progression: <%= details[:row_progression].to_a.join(", ") %>
+<% end %>
 
 Row estimates
 <%= details[:row_estimates].to_a.map { |k, v| "- #{k}: #{v}" }.join("\n") %><% end %><% if details[:table_indexes] %>

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

@@ -7,24 +7,24 @@
     <h3>By Database</h3>
 
     <div id="chart-1" class="chart pie-chart">Loading...</div>
-    <script>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.PieChart("chart-1", <%= pghero_js_value(@connections_by_database) %>);
-    </script>
+    <% end %>
 
     <h3>By User</h3>
 
     <div id="chart-2" class="chart pie-chart">Loading...</div>
-    <script>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.PieChart("chart-2", <%= pghero_js_value(@connections_by_user) %>);
-    </script>
+    <% end %>
 
     <% if @connections_by_ssl_status %>
       <h3>By Security</h3>
 
       <div id="chart-3" class="chart pie-chart">Loading...</div>
-      <script>
+      <%= javascript_tag nonce: true do %>
         new Chartkick.PieChart("chart-3", <%= pghero_js_value(@connections_by_ssl_status) %>);
-      </script>
+      <% end %>
     <% end %>
 
     <%= render partial: "connections_table", locals: {connection_sources: @connection_sources} %>

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

@@ -4,9 +4,9 @@
   <%= form_tag explain_path do %>
     <div class="field"><%= text_area_tag :query, @query, placeholder: "Enter a SQL query" %></div>
     <p>
-      <%= submit_tag "Explain", class: "btn btn-info", style: "margin-right: 10px;" %>
+      <%= submit_tag "Explain", class: "btn btn-info right-5" %>
       <% if @explain_analyze_enabled %>
-        <%= submit_tag "Analyze", class: "btn btn-danger", style: "margin-right: 10px;" %>
+        <%= submit_tag "Analyze", class: "btn btn-danger right-5" %>
       <% end %>
       <%= submit_tag "Visualize", class: "btn btn-danger" %>
     </p>

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

@@ -127,7 +127,7 @@
     <table class="table">
       <thead>
         <tr>
-          <th style="width: 33%;">Column</th>
+          <th class="width-33">Column</th>
           <th>Sequence</th>
         </tr>
       </thead>
@@ -251,7 +251,7 @@
       <thead>
         <tr>
           <th>Table</th>
-          <th style="width: 20%;">Transactions Left</th>
+          <th class="width-20">Transactions Left</th>
         </tr>
       </thead>
       <tbody>
@@ -279,9 +279,9 @@
       <thead>
         <tr>
           <th>Column</th>
-          <th style="width: 20%;">Type</th>
-          <th style="width: 20%;">Values Left</th>
-          <th style="width: 10%;">% Left</th>
+          <th class="width-20">Type</th>
+          <th class="width-20">Values Left</th>
+          <th class="width-10">% Left</th>
         </tr>
       </thead>
       <tbody>
@@ -332,7 +332,7 @@
             </td>
           </tr>
           <tr>
-            <td style="border-top: none; padding: 0;">
+            <td class="query-row">
               <pre><code>DROP INDEX CONCURRENTLY <%= pghero_pretty_ident(index[:name], schema: index[:schema]) %>;
 <%= index[:definition].sub("CREATE INDEX ", "CREATE INDEX CONCURRENTLY ") %>;</code></pre>
             </td>
@@ -366,7 +366,7 @@
             </td>
           </tr>
           <tr>
-            <td style="border-top: none; padding: 0;">
+            <td class="query-row">
               <pre><code>ALTER TABLE <%= pghero_pretty_ident(constraint[:table], schema: constraint[:schema]) %> VALIDATE CONSTRAINT <%= pghero_pretty_ident(constraint[:name]) %>;</code></pre>
             </td>
           </tr>
@@ -383,15 +383,15 @@
     <p>
       These indexes exist, but aren’t needed. Remove them
       <% if @show_migrations %>
-      <a href="javascript: void(0);" onclick="document.getElementById('migration2').style.display = 'block';">with a migration</a>
+      <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
     </p>
 
-    <div id="migration2" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration remove_unneeded_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @duplicate_indexes.each do |query| %>
+      <pre><% @duplicate_indexes.each do |query| %>
 <%= pghero_remove_index(query[:unneeded_index]) %><% end %></pre>
     </div>
 
@@ -426,14 +426,14 @@
       Add indexes to speed up queries.
       <% if @show_migrations %>
       Here’s a
-      <a href="javascript: void(0);" onclick="document.getElementById('migration3').style.display = 'block';">migration</a> to help.
+      <a href="#" class="migration-link">migration</a> to help.
       <% end %>
     </p>
 
-    <div id="migration3" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration add_suggested_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;">commit_db_transaction
+      <pre>commit_db_transaction
 <% @suggested_indexes.each do |index| %>
 <% if index[:using] && index[:using] != "btree" %>
 add_index <%= index[:table].to_sym.inspect %>, <%= index[:columns].first.inspect %>, using: <%= index[:using].inspect %>, algorithm: :concurrently
@@ -487,15 +487,15 @@ pg_stat_statements.track = all</pre>
     <p>
       Unused indexes cause unnecessary overhead. Remove them
       <% if @show_migrations %>
-        <a href="javascript: void(0);" onclick="document.getElementById('migration').style.display = 'block';">with a migration</a>
+        <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
     </p>
 
-    <div id="migration" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration remove_unused_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @unused_indexes.each do |query| %>
+      <pre><% @unused_indexes.each do |query| %>
 <%= pghero_remove_index(query)%><% end %></pre>
     </div>
 
@@ -503,7 +503,7 @@ pg_stat_statements.track = all</pre>
       <thead>
         <tr>
           <th>Name</th>
-          <th style="width: 20%;">Index Size</th>
+          <th class="width-20">Index Size</th>
         </tr>
       </thead>
       <tbody>
@@ -518,6 +518,6 @@ pg_stat_statements.track = all</pre>
   </div>
 <% end %>
 
-<script>
+<%= javascript_tag nonce: true do %>
   highlightQueries();
-</script>
+<% end %>

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

@@ -25,15 +25,15 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
       <thead>
         <tr>
           <th>Index</th>
-          <th style="width: 15%;">Bloat</th>
-          <th style="width: 15%;">Size</th>
+          <th class="width-15">Bloat</th>
+          <th class="width-15">Size</th>
         </tr>
       </thead>
       <tbody>
         <% @index_bloat.each do |index| %>
           <tr>
             <td>
-              <span style="word-break: break-all;"><%= index[:index] %></span>
+              <span class="break-all"><%= index[:index] %></span>
               <% if index[:primary] %>
                 <span class="primary-key">PRIMARY</span>
               <% end %>
@@ -43,7 +43,7 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
           </tr>
           <% if @show_sql && !index[:primary] %>
             <tr>
-              <td colspan="3" style="border-top: none; padding: 0;">
+              <td colspan="3" class="query-row">
                 <% new_index = "new_#{index[:index]}".first(63) %>
                 <pre><code><%= index[:definition].sub(" INDEX ", " INDEX CONCURRENTLY \n    ").sub(index[:index], new_index) %>;
 
@@ -67,6 +67,6 @@ ALTER INDEX <%= pghero_pretty_ident(new_index) %>
   <% end %>
 </div>
 
-<script>
+<%= javascript_tag nonce: true do %>
   highlightQueries();
-</script>
+<% end %>

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

@@ -5,10 +5,10 @@
     <thead>
       <tr>
         <th>Table</th>
-        <th style="width: 20%;">Last Vacuum</th>
-        <th style="width: 20%;">Last Analyze</th>
+        <th class="width-20">Last Vacuum</th>
+        <th class="width-20">Last Analyze</th>
         <% if @show_dead_rows %>
-          <th style="width: 20%;">Dead Rows</th>
+          <th class="width-20">Dead Rows</th>
         <% end %>
       </tr>
     </thead>

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

@@ -4,13 +4,13 @@
   <% end %>
 
   <% if !@historical_query_stats_enabled %>
-    <h1 style="float: left;">Queries</h1>
+    <h1 class="push-left">Queries</h1>
   <% end %>
 
   <% if @historical_query_stats_enabled %>
     <%= render partial: "query_stats_slider" %>
   <% elsif @database.query_stats_table_exists? && (columns = @database.missing_query_stats_columns).any? %>
-    <div style="clear: both;">
+    <div class="clear-both">
       <p>Add missing columns to re-enable historical query stats.</p>
       <pre><code><% @database.missing_query_stats_columns.each do |column| %>ALTER TABLE pghero_query_stats ADD COLUMN "<%= column %>" <%= column == "query_hash" ? "bigint" : "text" %>;
 <% end %></code></pre>
@@ -23,9 +23,9 @@
       <div class="alert alert-danger">Cannot understand start or end time.</div>
     <% elsif @query_stats.any? || @historical_query_stats_enabled %>
       <%= render partial: "queries_table", locals: {queries: @query_stats, sort_headers: true} %>
-      <script>
+      <%= javascript_tag nonce: true do %>
         highlightQueries();
-      </script>
+      <% end %>
     <% else %>
       <p>Stats are not available yet. Come back soon!</p>
     <% end %>

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

@@ -7,8 +7,8 @@
   </h1>
 
   <h1>Size</h1>
-  <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
+  <div id="chart-1" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
     new Chartkick.LineChart("chart-1", <%= pghero_js_value(@chart_data) %>, {colors: ["#5bc0de"], legend: false, min: null, bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <% end %>
 </div>

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

@@ -1,8 +1,8 @@
 <div class="content">
-  <pre><code style="max-height: 230px; overflow: hidden;" onclick="this.style.maxHeight = 'none';"><%= @query %></code></pre>
-  <script>
+  <pre><code class="query-code"><%= @query %></code></pre>
+  <%= javascript_tag nonce: true do %>
     highlightQueries()
-  </script>
+  <% end %>
 
   <% if @explain_enabled && @explainable_query %>
     <p>
@@ -11,11 +11,11 @@
   <% end %>
 
   <% if @origins && @origins.keys.select { |k| k.length > 0 }.any? %>
-    <table style="table-layout: auto;">
+    <table class="origins-table">
       <thead>
         <tr>
           <th colspan="2">
-            <div style="float: right;">Approx. Time</div>
+            <div class="push-right">Approx. Time</div>
             Origin
           </th>
         </tr>
@@ -23,14 +23,14 @@
       <tbody>
         <% @origins.sort_by { |o, c| [-c, o.to_s] }.each do |origin, count| %>
           <tr>
-            <td class="origin" style="width: 90%;">
+            <td class="origin">
               <% if origin.length > 0 %>
                 <%= origin %>
               <% else %>
                 <span class="text-muted">Unknown</span>
               <% end %>
             </td>
-            <td style="text-align: right; width: 10%;">
+            <td class="origin-pct">
               <% pct = (100.0 * count / @total_count).round %>
               <% if pct == 0 %>
                 &lt; 1%
@@ -47,22 +47,22 @@
   <!-- chart -->
   <% if @chart_data %>
     <h1>Total Time <small>ms</small></h1>
-    <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
+    <div id="chart-1" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.LineChart("chart-1", <%= pghero_js_value(@chart_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <% end %>
 
     <h1>Average Time <small>ms</small></h1>
-    <div id="chart-2" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
+    <div id="chart-2" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.LineChart("chart-2", <%= pghero_js_value(@chart2_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <% end %>
 
     <h1>Calls</h1>
-    <div id="chart-3" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
+    <div id="chart-3" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.LineChart("chart-3", <%= pghero_js_value(@chart3_data) %>, {colors: ["#5bc0de"], legend: false, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <% end %>
   <% else %>
     <p>
       Enable
@@ -77,8 +77,8 @@
     <table>
       <thead>
         <tr>
-          <th style="width: 25%;">Name</th>
-          <th style="width: 25%;">Rows</th>
+          <th class="width-25">Name</th>
+          <th class="width-25">Rows</th>
           <th>Indexes</th>
         </tr>
       </thead>
@@ -86,7 +86,7 @@
         <% @tables.each do |table| %>
           <tr>
             <td><%= table %></td>
-            <td><%= @row_counts[table] %></td>
+            <td><%= number_with_delimiter(@row_counts[table]) if @row_counts[table] %></td>
             <td>
               <% if @indexes_timeout %>
                 Not available

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

@@ -4,10 +4,10 @@
   <p>Database Size: <%= @database_size %></p>
 
   <% if @system_stats_enabled %>
-    <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
+    <div id="chart-1" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.LineChart("chart-1", <%= pghero_js_value(free_space_stats_path) %>, {colors: ["#5bc0de"], bytes: true, library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <% end %>
   <% end %>
 
   <!--
@@ -20,7 +20,7 @@
     <p>
       <%= pluralize(@unused_indexes.size, "unused index") %>. Remove them
       <% if @show_migrations %>
-        <a href="javascript: void(0);" onclick="document.getElementById('migration').style.display = 'block';">with a migration</a>
+        <a href="#" class="migration-link">with a migration</a>
       <% end %>
       for faster writes.
 
@@ -29,10 +29,10 @@
       <% end %>
     </p>
 
-    <div id="migration" style="display: none;">
+    <div class="migration">
       <pre>rails generate migration remove_unused_indexes</pre>
       <p>And paste</p>
-      <pre style="overflow: scroll; white-space: pre; word-break: normal;"><% @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.each do |query| %>
+      <pre><% @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.each do |query| %>
 <%= pghero_remove_index(query) %><% end %></pre>
     </div>
   <% end %>
@@ -44,20 +44,20 @@
       <thead>
         <tr>
           <th><%= link_to (@only_tables ? "Table" : "Relation"), @header_options.merge(sort: "name") %></th>
-          <th style="width: 15%;"><%= link_to "Size", @header_options %></th>
+          <th class="width-15"><%= link_to "Size", @header_options %></th>
           <% if @space_stats_enabled %>
-            <th style="width: 15%;"><%= link_to "#{@days}d Growth", @header_options.merge(sort: "growth") %></th>
+            <th class="width-15"><%= link_to "#{@days}d Growth", @header_options.merge(sort: "growth") %></th>
           <% end %>
         </tr>
       </thead>
       <tbody>
         <% @relation_sizes.each do |query| %>
           <tr>
-            <td style="<%= query[:type] == "index" ? "font-style: italic;" : "" %>">
-              <span style="word-break: break-all;">
+            <td class="<%= query[:type] == "index" ? "space-index" : "" %>">
+              <span class="break-all">
                 <% name = query[:relation] || query[:table] %>
                 <% if @space_stats_enabled %>
-                  <%= link_to name, relation_space_path(name, schema: query[:schema]), target: "_blank", style: "color: inherit;" %>
+                  <%= link_to name, relation_space_path(name, schema: query[:schema]), target: "_blank", class: "relation-link" %>
                 <% else %>
                   <%= name %>
                 <% end %>

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

@@ -7,28 +7,28 @@
   <% path_options = {params: {duration: @duration, period: @period}} %>
 
   <h1>CPU</h1>
-  <div id="chart-1" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
+  <div id="chart-1" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
     new Chartkick.LineChart("chart-1", <%= pghero_js_value(cpu_usage_path(path_options)) %>, {max: 100, colors: ["#5bc0de"], suffix: "%", library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <% end %>
 
   <h1>Load</h1>
-  <div id="chart-2" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
+  <div id="chart-2" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
     new Chartkick.LineChart("chart-2", <%= pghero_js_value(load_stats_path(path_options)) %>, {colors: ["#5bc0de", "#d9534f"], library: {plugins: {tooltip: {intersect: false, mode: "nearest"}}}})
-  </script>
+  <% end %>
 
   <h1>Connections</h1>
-  <div id="chart-3" class="chart" style="margin-bottom: 20px;">Loading...</div>
-  <script>
+  <div id="chart-3" class="chart">Loading...</div>
+  <%= javascript_tag nonce: true do %>
     new Chartkick.LineChart("chart-3", <%= pghero_js_value(connection_stats_path(path_options)) %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-  </script>
+  <% end %>
 
   <% if @database.replica? %>
     <h1>Replication Lag</h1>
-    <div id="chart-4" class="chart" style="margin-bottom: 20px;">Loading...</div>
-    <script>
+    <div id="chart-4" class="chart">Loading...</div>
+    <%= javascript_tag nonce: true do %>
       new Chartkick.LineChart("chart-4", <%= pghero_js_value(replication_lag_stats_path(path_options)) %>, {colors: ["#5bc0de"], library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
-    </script>
+    <% end %>
   <% end %>
 </div>

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

@@ -5,7 +5,7 @@
     <thead>
       <tr>
         <th>Setting</th>
-        <th style="width: 20%;">Value</th>
+        <th class="width-20">Value</th>
       </tr>
     </thead>
     <tbody>
@@ -30,7 +30,7 @@
       <thead>
         <tr>
           <th>Setting</th>
-          <th style="width: 20%;">Value</th>
+          <th class="width-20">Value</th>
         </tr>
       </thead>
       <tbody>

data/lib/pghero/database.rb

@@ -126,7 +126,7 @@ module PgHero
         # rough check for Postgres adapter
         # keep this message generic so it's useful
         # when empty url set in Docker image pghero.yml
-        unless @connection_model.connection.adapter_name =~ /postg/i
+        unless @connection_model.connection_db_config.adapter.to_s.match?(/postg/i)
           raise Error, "Invalid connection URL"
         end
         @adapter_checked = true
@@ -145,7 +145,7 @@ module PgHero
         config_options = {env_name: PgHero.env, PgHero.spec_name_key => config["spec"], PgHero.include_replicas_key => true}
         resolved = ActiveRecord::Base.configurations.configs_for(**config_options)
         raise Error, "Spec not found: #{config["spec"]}" unless resolved
-        url = ActiveRecord::VERSION::STRING.to_f >= 6.1 ? resolved.configuration_hash : resolved.config
+        url = resolved.configuration_hash
       end
 
       url = url.dup

data/lib/pghero/engine.rb

@@ -4,8 +4,8 @@ module PgHero
 
     initializer "pghero", group: :all do |app|
       # check if Rails api mode
-      if app.config.respond_to?(:assets)
-        if defined?(Sprockets) && Sprockets::VERSION.to_i >= 4
+      if app.config.respond_to?(:assets) && defined?(Sprockets)
+        if Sprockets::VERSION.to_i >= 4
           app.config.assets.precompile << "pghero/application.js"
           app.config.assets.precompile << "pghero/application.css"
           app.config.assets.precompile << "pghero/favicon.png"

data/lib/pghero/methods/basic.rb

@@ -31,21 +31,26 @@ module PgHero
       end
 
       def quote_ident(value)
-        connection.quote_column_name(value)
+        with_connection { |c| c.quote_column_name(value) }
       end
 
       private
 
-      def select_all(sql, conn: nil, query_columns: [])
-        conn ||= connection
+      def select_all(sql, stats: false, query_columns: [])
+        with_connection(stats: stats) do |conn|
+          select_all_leased(sql, conn: conn, query_columns: query_columns)
+        end
+      end
+
+      def select_all_leased(sql, conn:, query_columns:)
         # squish for logs
         retries = 0
         begin
           result = conn.select_all(add_source(squish(sql)))
-          if ActiveRecord::VERSION::STRING.to_f >= 6.1
-            result = result.map(&:symbolize_keys)
+          if ActiveRecord::VERSION::MAJOR >= 8
+            result = result.to_a.map(&:symbolize_keys)
           else
-            result = result.map { |row| row.to_h { |col, val| [col.to_sym, result.column_types[col].send(:cast_value, val)] } }
+            result = result.map(&:symbolize_keys)
           end
           if filter_data
             query_columns.each do |column|
@@ -81,7 +86,7 @@ module PgHero
       end
 
       def select_all_stats(sql, **options)
-        select_all(sql, **options, conn: stats_connection)
+        select_all(sql, **options, stats: true)
       end
 
       def select_all_size(sql)
@@ -92,24 +97,17 @@ module PgHero
         result
       end
 
-      def select_one(sql, conn: nil)
-        select_all(sql, conn: conn).first.values.first
-      end
-
-      def select_one_stats(sql)
-        select_one(sql, conn: stats_connection)
+      def select_one(sql)
+        select_all(sql).first.values.first
       end
 
       def execute(sql)
-        connection.execute(add_source(sql))
-      end
-
-      def connection
-        connection_model.connection
+        with_connection { |c| c.execute(add_source(sql)) }
       end
 
-      def stats_connection
-        ::PgHero::Stats.connection
+      def with_connection(stats: false, &block)
+        model = stats ? ::PgHero::Stats : connection_model
+        model.connection_pool.with_connection(&block)
       end
 
       def squish(str)
@@ -121,15 +119,15 @@ module PgHero
       end
 
       def quote(value)
-        connection.quote(value)
+        with_connection { |c| c.quote(value) }
       end
 
       def quote_table_name(value)
-        connection.quote_table_name(value)
+        with_connection { |c| c.quote_table_name(value) }
       end
 
       def quote_column_name(value)
-        connection.quote_column_name(value)
+        with_connection { |c| c.quote_column_name(value) }
       end
 
       def unquote(part)
@@ -150,7 +148,7 @@ module PgHero
       end
 
       def table_exists?(table)
-        stats_connection.table_exists?(table)
+        with_connection(stats: true) { |c| c.table_exists?(table) }
       end
     end
   end

data/lib/pghero/methods/explain.rb

@@ -9,7 +9,7 @@ module PgHero
 
         # use transaction for safety
         with_transaction(statement_timeout: (explain_timeout_sec * 1000).round, rollback: true) do
-          if (sql.sub(/;\z/, "").include?(";") || sql.upcase.include?("COMMIT")) && !explain_safe?
+          if (sql.delete_suffix(";").include?(";") || sql.upcase.include?("COMMIT")) && !explain_safe?
             raise ActiveRecord::StatementInvalid, "Unsafe statement"
           end
           explanation = execute("EXPLAIN #{sql}").map { |v| v["QUERY PLAN"] }.join("\n")

data/lib/pghero/methods/query_stats.rb

@@ -322,7 +322,7 @@ module PgHero
             all_queries_total_minutes: stats2.sum { |s| s[:all_queries_total_minutes] }
           }
           value[:total_percent] = value[:total_minutes] * 100.0 / value[:all_queries_total_minutes]
-          value[:explainable_query] = stats2.map { |s| s[:explainable_query] }.select { |q| q && explainable?(q) }.first
+          value[:explainable_query] = stats2.map { |s| s[:explainable_query] }.find { |q| q && explainable?(q) }
           query_stats << value
         end
         query_stats

data/lib/pghero/methods/suggested_indexes.rb

@@ -46,7 +46,7 @@ module PgHero
                   indexes += existing_columns["brin"][index[:table]]
                 end
 
-                covering_index = indexes.find { |e| index_covers?(e.map { |v| v.sub(/ inet_ops\z/, "") }, index[:columns]) }
+                covering_index = indexes.find { |e| index_covers?(e.map { |v| v.delete_suffix(" inet_ops") }, index[:columns]) }
                 if covering_index
                   best_index[:covering_index] = covering_index
                   best_index[:explanation] = "Covered by index on (#{covering_index.join(", ")})"
@@ -79,7 +79,9 @@ module PgHero
         suggested_indexes.each do |index|
           p index
           if create
-            connection.execute("CREATE INDEX CONCURRENTLY ON #{quote_table_name(index[:table])} (#{index[:columns].map { |c| quote_column_name(c) }.join(",")})")
+            with_connection do |connection|
+              connection.execute("CREATE INDEX CONCURRENTLY ON #{quote_table_name(index[:table])} (#{index[:columns].map { |c| quote_column_name(c) }.join(",")})")
+            end
           end
         end
       end

data/lib/pghero/methods/system.rb

@@ -136,8 +136,8 @@ module PgHero
         start_time = end_time - duration
 
         # validate input since we need to interpolate below
-        raise Error, "Invalid metric name" unless metric_name =~ /\A[a-z\/_]+\z/i
-        raise Error, "Invalid database id" unless gcp_database_id =~ /\A[a-z0-9\-:]+\z/i
+        raise Error, "Invalid metric name" unless /\A[a-z\/_]+\z/i.match?(metric_name)
+        raise Error, "Invalid database id" unless /\A[a-z0-9\-:]+\z/i.match?(gcp_database_id)
 
         # we handle four situations:
         # 1. google-cloud-monitoring-v3

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "3.5.0"
+  VERSION = "3.6.1"
 end

data/lib/pghero.rb

@@ -64,7 +64,7 @@ module PgHero
       :query_stats_available?, :query_stats_enabled?, :query_stats_extension_enabled?, :query_stats_readable?,
       :rds_stats, :read_iops_stats, :aws_region, :relation_sizes, :replica?, :replication_lag, :replication_lag_stats,
       :reset_query_stats, :reset_stats, :running_queries, :aws_secret_access_key, :sequence_danger, :sequences, :settings,
-      :slow_queries, :space_growth, :ssl_used?, :stats_connection, :suggested_indexes, :suggested_indexes_by_query,
+      :slow_queries, :space_growth, :ssl_used?, :suggested_indexes, :suggested_indexes_by_query,
       :suggested_indexes_enabled?, :system_stats_enabled?, :table_caching, :table_hit_rate, :table_stats,
       :total_connections, :transaction_id_danger, :unused_indexes, :unused_tables, :write_iops_stats
 
@@ -243,14 +243,12 @@ module PgHero
 
     # private
     def connection_config(model)
-      ActiveRecord::VERSION::STRING.to_f >= 6.1 ? model.connection_db_config.configuration_hash : model.connection_config
+      model.connection_db_config.configuration_hash
     end
 
     # private
-    # Rails 6.1 deprecates `spec_name` for `name`
-    # https://github.com/rails/rails/pull/38536
     def spec_name_key
-      ActiveRecord::VERSION::STRING.to_f >= 6.1 ? :name : :spec_name
+      :name
     end
 
     # private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2024-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 description:
 email: andrew@ankane.org
 executables: []
@@ -117,14 +117,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A performance dashboard for Postgres