pghero 3.7.0 → 4.0.0

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

@@ -6,7 +6,7 @@
     <p>Indexes can become <%= link_to "bloated over time", "https://www.compose.com/articles/postgresql-bloat-origins-monitoring-and-managing/", target: "_blank" %>. Recreate them to remove bloat.</p>
 
     <p>For each index, run:</p>
-    <pre><code>CREATE INDEX CONCURRENTLY new_index ...;
+    <pre><code class="language-pgsql">CREATE INDEX CONCURRENTLY new_index ...;
 ANALYZE table;
 DROP INDEX CONCURRENTLY index;
 ANALYZE table;
@@ -45,7 +45,7 @@ ALTER INDEX new_index RENAME TO index;</code></pre>
             <tr>
               <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) %>;
+                <pre><code class="language-pgsql"><%= index[:definition].sub(" INDEX ", " INDEX CONCURRENTLY \n    ").sub(index[:index], new_index) %>;
 
 ANALYZE <%= pghero_pretty_ident(index[:table], schema: index[:schema]) %>;
 

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

@@ -3,9 +3,13 @@
 
   <p><%= pluralize(@running_queries.size, "query") %></p>
 
-  <%= render partial: "live_queries_table", locals: {queries: @running_queries, vacuum_progress: @vacuum_progress} %>
+  <% if @running_queries.any? %>
+    <%= render partial: "live_queries_table", locals: {queries: @running_queries, vacuum_progress: @vacuum_progress} %>
 
-  <p><%= button_to "Kill all connections", kill_all_path, class: "btn btn-danger" %></p>
+    <% if @kill_enabled %>
+      <p><%= button_to "Kill all connections", kill_all_path, class: "btn btn-danger" %></p>
 
-  <p class="text-muted">You may need to restart your app servers afterwards.</p>
+      <p class="text-muted">You may need to restart your app servers afterwards.</p>
+    <% end %>
+  <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <div class="content">
-  <% if @query_stats_enabled && !@historical_query_stats_enabled %>
-    <%= button_to "Reset", reset_query_stats_path, class: "btn btn-danger", style: "float: right;" %>
+  <% if @query_stats_enabled && !@historical_query_stats_enabled && !@database.query_stats_table_exists? %>
+    <%= button_to "Reset", reset_query_stats_path, class: "btn btn-danger push-right" %>
   <% end %>
 
   <% if !@historical_query_stats_enabled %>
@@ -9,11 +9,31 @@
 
   <% if @historical_query_stats_enabled %>
     <%= render partial: "query_stats_slider" %>
-  <% elsif @database.query_stats_table_exists? && (columns = @database.missing_query_stats_columns).any? %>
+  <% elsif @database.query_stats_table_exists? && !@database.queries_table_exists? %>
     <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>
+      <p>Update the database to re-enable historical query stats.</p>
+      <% if PgHero.show_migrations %>
+      <pre><code>rails generate pghero:upgrade_query_stats
+rails db:migrate</code></pre>
+      <% else %>
+      <pre><code class="language-pgsql">CREATE TABLE pghero_queries (
+    id bigserial PRIMARY KEY,
+    query text
+);
+CREATE INDEX ON pghero_queries USING hash (query);
+
+ALTER TABLE pghero_query_stats ADD COLUMN query_id bigint;
+
+INSERT INTO pghero_queries (query)
+    SELECT DISTINCT query FROM pghero_query_stats WHERE query IS NOT NULL;
+
+UPDATE pghero_query_stats SET query_id = pghero_queries.id, query = NULL
+    FROM pghero_queries WHERE pghero_queries.query = pghero_query_stats.query;
+
+ALTER TABLE pghero_query_stats DROP COLUMN query;
+
+VACUUM (FULL, ANALYZE) pghero_query_stats;</code></pre>
+      <% end %>
       <p>Then restart the web server.</p>
     </div>
   <% end %>
@@ -22,6 +42,11 @@
     <% if @error %>
       <div class="alert alert-danger">Cannot understand start or end time.</div>
     <% elsif @query_stats.any? || @historical_query_stats_enabled %>
+      <% if @user %>
+        <div class="clear-both">
+          <p>Showing queries for <code><%= @user %></code> user. <%= link_to "Show all", @link_options, id: "show-all" %></p>
+        </div>
+      <% end %>
       <%= render partial: "queries_table", locals: {queries: @query_stats, sort_headers: true} %>
       <%= javascript_tag nonce: true do %>
         highlightQueries();

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

@@ -1,5 +1,5 @@
 <div class="content">
-  <pre><code class="query-code"><%= @query %></code></pre>
+  <pre><code class="query-code language-pgsql"><%= @query %></code></pre>
   <%= javascript_tag nonce: true do %>
     highlightQueries()
   <% end %>
@@ -46,16 +46,16 @@
 
   <!-- chart -->
   <% if @chart_data %>
-    <h1>Total Time <small>ms</small></h1>
+    <h1>Total Time</h1>
     <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"}}}})
+      new Chartkick.LineChart("chart-1", <%= pghero_js_value(@chart_data) %>, {colors: ["#5bc0de"], legend: false, suffix: " ms", library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
     <% end %>
 
-    <h1>Average Time <small>ms</small></h1>
+    <h1>Average Time</h1>
     <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"}}}})
+      new Chartkick.LineChart("chart-2", <%= pghero_js_value(@chart2_data) %>, {colors: ["#5bc0de"], legend: false, suffix: " ms", library: {plugins: {tooltip: {intersect: false, mode: "index"}}}})
     <% end %>
 
     <h1>Calls</h1>

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

@@ -18,7 +18,7 @@
 
   <% if @unused_indexes.any? %>
     <p>
-      <%= pluralize(@unused_indexes.size, "unused index") %>. Remove them
+      <%= pluralize(@unused_indexes.size, "unused index", "unused indexes") %><%= @database.unused_index_bytes > 0 ? " over #{PgHero.pretty_size(@database.unused_index_bytes)}" : "" %>. Remove them
       <% if @show_migrations %>
         <a href="#" class="migration-link">with a migration</a>
       <% end %>
@@ -30,11 +30,12 @@
     </p>
 
     <div class="migration">
-      <pre>rails generate migration remove_unused_indexes</pre>
+      <pre><code>rails generate migration remove_unused_indexes</code></pre>
       <p>And paste</p>
-      <pre><% @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.each do |query| %>
-<%= pghero_remove_index(query) %><% end %></pre>
+      <pre><code><%= @unused_indexes.sort_by { |q| [-q[:size_bytes], q[:index]] }.map { |q| pghero_remove_index(q) }.join("\n") %></code></pre>
     </div>
+  <% else %>
+    <p>No unused indexes<%= @database.unused_index_bytes > 0 ? " over #{PgHero.pretty_size(@database.unused_index_bytes)}" : "" %></p>
   <% end %>
 
   <% if @sizes_timeout %>

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

@@ -48,6 +48,6 @@
       </tbody>
     </table>
 
-    <p>Check out <%= link_to "Autovacuum Tuning Basics", "https://blog.2ndquadrant.com/autovacuum-tuning-basics/", target: "_blank" %> for recommendations.</p>
+    <p>Check out <%= link_to "Autovacuum Tuning Basics", "https://www.enterprisedb.com/blog/autovacuum-tuning-basics", target: "_blank" %> for recommendations.</p>
   </div>
 <% end %>

data/lib/generators/pghero/templates/config.yml.tt

@@ -6,7 +6,6 @@ databases:
     # System stats
     # aws_db_instance_identifier: my-instance
     # gcp_database_id: my-project:my-instance
-    # azure_resource_id: my-resource-id
 
   # Add more databases
   # other:
@@ -24,6 +23,9 @@ databases:
 # Minimum connections for high connections warning
 # total_connections_threshold: 500
 
+# Minimum size for unused indexes
+# unused_index_megabytes: 10
+
 # Explain functionality
 # explain: true / false / analyze
 
@@ -48,5 +50,8 @@ databases:
 # aws_secret_access_key: <%%= ENV["AWS_SECRET_ACCESS_KEY"] %>
 # aws_region: us-east-1
 
+# Disable killing queries and connections
+# disable_kill: true
+
 # Filter data from queries (experimental)
 # filter_data: true

data/lib/generators/pghero/templates/query_stats.rb.tt

@@ -1,9 +1,15 @@
 class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
+    create_table :pghero_queries do |t|
+      t.text :query
+    end
+
+    add_index :pghero_queries, :query, using: :hash
+
     create_table :pghero_query_stats do |t|
       t.text :database
       t.text :user
-      t.text :query
+      t.references :query, index: false
       t.integer :query_hash, limit: 8
       t.float :total_time
       t.integer :calls, limit: 8

data/lib/generators/pghero/templates/upgrade_query_stats.rb.tt

@@ -0,0 +1,23 @@
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :pghero_queries do |t|
+      t.text :query
+    end
+
+    add_index :pghero_queries, :query, using: :hash
+
+    add_reference :pghero_query_stats, :query, index: false
+
+    execute <<~SQL
+      INSERT INTO pghero_queries (query)
+        SELECT DISTINCT query FROM pghero_query_stats WHERE query IS NOT NULL
+    SQL
+
+    execute <<~SQL
+      UPDATE pghero_query_stats SET query_id = pghero_queries.id, query = NULL
+        FROM pghero_queries WHERE pghero_queries.query = pghero_query_stats.query
+    SQL
+
+    remove_column :pghero_query_stats, :query
+  end
+end

data/lib/generators/pghero/upgrade_query_stats_generator.rb

@@ -0,0 +1,19 @@
+require "rails/generators"
+require "rails/generators/active_record"
+
+module Pghero
+  module Generators
+    class UpgradeQueryStatsGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
+
+      def copy_migration
+        migration_template "upgrade_query_stats.rb", "db/migrate/upgrade_pghero_query_stats.rb", migration_version: migration_version
+      end
+
+      def migration_version
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
+      end
+    end
+  end
+end

data/lib/pghero/database.rb

@@ -16,7 +16,6 @@ module PgHero
     include Methods::SuggestedIndexes
     include Methods::System
     include Methods::Tables
-    include Methods::Users
 
     attr_reader :id, :config
 
@@ -62,9 +61,12 @@ module PgHero
       (config["long_running_query_sec"] || PgHero.config["long_running_query_sec"] || PgHero.long_running_query_sec).to_i
     end
 
-    # defaults to 100 megabytes
+    def unused_index_bytes
+      ((config["unused_index_megabytes"] || PgHero.config["unused_index_megabytes"] || 10).to_f * 1.megabyte).to_i
+    end
+
     def index_bloat_bytes
-      (config["index_bloat_bytes"] || PgHero.config["index_bloat_bytes"] || 104857600).to_i
+      (config["index_bloat_bytes"] || PgHero.config["index_bloat_bytes"] || 100.megabytes).to_i
     end
 
     def aws_access_key_id
@@ -89,11 +91,6 @@ module PgHero
       @gcp_database_id ||= config["gcp_database_id"]
     end
 
-    # environment variable is only used if no config file
-    def azure_resource_id
-      @azure_resource_id ||= config["azure_resource_id"]
-    end
-
     # must check keys for booleans
     def filter_data
       unless defined?(@filter_data)
@@ -142,7 +139,7 @@ module PgHero
 
       # resolve spec
       if !url && config["spec"]
-        config_options = {env_name: PgHero.env, PgHero.spec_name_key => config["spec"], PgHero.include_replicas_key => true}
+        config_options = {env_name: PgHero.env, name: config["spec"], include_hidden: true}
         resolved = ActiveRecord::Base.configurations.configs_for(**config_options)
         raise Error, "Spec not found: #{config["spec"]}" unless resolved
         url = resolved.configuration_hash

data/lib/pghero/engine.rb

@@ -5,16 +5,9 @@ module PgHero
     initializer "pghero", group: :all do |app|
       # check if Rails api mode
       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"
-        else
-          # use a proc instead of a string
-          app.config.assets.precompile << proc { |path| path == "pghero/application.js" }
-          app.config.assets.precompile << proc { |path| path == "pghero/application.css" }
-          app.config.assets.precompile << proc { |path| path == "pghero/favicon.png" }
-        end
+        app.config.assets.precompile << "pghero/application.js"
+        app.config.assets.precompile << "pghero/application.css"
+        app.config.assets.precompile << "pghero/favicon.png"
       end
 
       file_config = PgHero.file_config || {}

data/lib/pghero/methods/basic.rb

@@ -36,17 +36,28 @@ module PgHero
 
       private
 
-      def select_all(sql, stats: false, query_columns: [])
+      def prepare_sql(sql, binds = nil, stats: false)
+        if binds && !binds.empty?
+          model = stats ? PgHero::Stats : connection_model
+          sql = model.sanitize_sql_array([sql, binds])
+        end
+
         with_connection(stats: stats) do |conn|
+          yield conn, sql
+        end
+      end
+
+      def select_all(sql, binds = nil, stats: false, query_columns: [])
+        # squish for logs
+        prepare_sql(sql.to_str.squish, binds, stats: stats) do |conn, sql|
           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)))
+          result = conn.select_all(sql)
           if ActiveRecord::VERSION::MAJOR >= 8
             result = result.to_a.map(&:symbolize_keys)
           else
@@ -56,7 +67,7 @@ module PgHero
             query_columns.each do |column|
               result.each do |row|
                 begin
-                  row[column] = PgQuery.normalize(row[column])
+                  row[column] = PgQuery.normalize(row[column]) unless row[column].nil?
                 rescue PgQuery::ParseError
                   # try replacing "interval $1" with "$1::interval"
                   # see https://github.com/lfittl/pg_query/issues/169 for more info
@@ -85,43 +96,33 @@ module PgHero
         end
       end
 
-      def select_all_stats(sql, **options)
-        select_all(sql, **options, stats: true)
+      def select_all_stats(sql, binds = nil, **options)
+        select_all(sql, binds, **options, stats: true)
       end
 
-      def select_all_size(sql)
-        result = select_all(sql)
+      def select_all_size(sql, binds = nil)
+        result = select_all(sql, binds)
         result.each do |row|
           row[:size] = PgHero.pretty_size(row[:size_bytes])
         end
         result
       end
 
-      def select_one(sql)
-        select_all(sql).first.values.first
+      def select_one(sql, binds = nil)
+        select_all(sql, binds).first&.values&.first
       end
 
-      def execute(sql)
-        with_connection { |c| c.execute(add_source(sql)) }
+      def execute(sql, binds = nil)
+        prepare_sql(sql, binds) do |conn, sql|
+          conn.execute(sql)
+        end
       end
 
       def with_connection(stats: false, &block)
-        model = stats ? ::PgHero::Stats : connection_model
+        model = stats ? PgHero::Stats : connection_model
         model.connection_pool.with_connection(&block)
       end
 
-      def squish(str)
-        str.to_s.squish
-      end
-
-      def add_source(sql)
-        "#{sql} /*pghero*/"
-      end
-
-      def quote(value)
-        with_connection { |c| c.quote(value) }
-      end
-
       def quote_table_name(value)
         with_connection { |c| c.quote_table_name(value) }
       end
@@ -140,8 +141,8 @@ module PgHero
 
       def with_transaction(lock_timeout: nil, statement_timeout: nil, rollback: false)
         connection_model.transaction do
-          select_all "SET LOCAL statement_timeout = #{statement_timeout.to_i}" if statement_timeout
-          select_all "SET LOCAL lock_timeout = #{lock_timeout.to_i}" if lock_timeout
+          select_all("SET LOCAL statement_timeout = :timeout", {timeout: statement_timeout.to_i}) if statement_timeout
+          select_all("SET LOCAL lock_timeout = :timeout", {timeout: lock_timeout.to_i}) if lock_timeout
           yield
           raise ActiveRecord::Rollback if rollback
         end

data/lib/pghero/methods/connections.rb

@@ -2,38 +2,22 @@ module PgHero
   module Methods
     module Connections
       def connections
-        if server_version_num >= 90500
-          select_all <<~SQL
-            SELECT
-              pg_stat_activity.pid,
-              datname AS database,
-              usename AS user,
-              application_name AS source,
-              client_addr AS ip,
-              state,
-              ssl
-            FROM
-              pg_stat_activity
-            LEFT JOIN
-              pg_stat_ssl ON pg_stat_activity.pid = pg_stat_ssl.pid
-            ORDER BY
-              pg_stat_activity.pid
-          SQL
-        else
-          select_all <<~SQL
-            SELECT
-              pid,
-              datname AS database,
-              usename AS user,
-              application_name AS source,
-              client_addr AS ip,
-              state
-            FROM
-              pg_stat_activity
-            ORDER BY
-              pid
-          SQL
-        end
+        select_all <<~SQL
+          SELECT
+            pg_stat_activity.pid,
+            datname AS database,
+            usename AS user,
+            application_name AS source,
+            client_addr AS ip,
+            state,
+            ssl
+          FROM
+            pg_stat_activity
+          LEFT JOIN
+            pg_stat_ssl ON pg_stat_activity.pid = pg_stat_ssl.pid
+          ORDER BY
+            pg_stat_activity.pid
+        SQL
       end
 
       def total_connections

data/lib/pghero/methods/explain.rb

@@ -1,26 +1,8 @@
 module PgHero
   module Methods
     module Explain
-      # TODO remove in 4.0
       # note: this method is not affected by the explain option
-      def explain(sql)
-        sql = squish(sql)
-        explanation = nil
-
-        # use transaction for safety
-        with_transaction(statement_timeout: (explain_timeout_sec * 1000).round, rollback: true) do
-          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")
-        end
-
-        explanation
-      end
-
-      # TODO rename to explain in 4.0
-      # note: this method is not affected by the explain option
-      def explain_v2(sql, analyze: nil, verbose: nil, costs: nil, settings: nil, generic_plan: nil, buffers: nil, wal: nil, timing: nil, summary: nil, format: "text")
+      def explain(sql, analyze: nil, verbose: nil, costs: nil, settings: nil, generic_plan: nil, buffers: nil, wal: nil, timing: nil, summary: nil, format: "text")
         options = []
         add_explain_option(options, "ANALYZE", analyze)
         add_explain_option(options, "VERBOSE", verbose)
@@ -33,7 +15,18 @@ module PgHero
         add_explain_option(options, "SUMMARY", summary)
         options << "FORMAT #{explain_format(format)}"
 
-        explain("(#{options.join(", ")}) #{sql}")
+        sql = "(#{options.join(", ")}) #{sql}"
+        explanation = nil
+
+        # use transaction for safety
+        with_transaction(statement_timeout: (explain_timeout_sec * 1000).round, rollback: true) do
+          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")
+        end
+
+        explanation
       end
 
       private

data/lib/pghero/methods/indexes.rb

@@ -68,8 +68,8 @@ module PgHero
          SQL
       end
 
-      def unused_indexes(max_scans: 50, across: [])
-        result = select_all_size <<~SQL
+      def unused_indexes(max_scans: 50, min_size: 0, across: [])
+        sql = <<~SQL
           SELECT
             schemaname AS schema,
             relname AS table,
@@ -82,11 +82,13 @@ module PgHero
             pg_index i ON ui.indexrelid = i.indexrelid
           WHERE
             NOT indisunique
-            AND idx_scan <= #{max_scans.to_i}
+            AND idx_scan <= :max_scans
+            AND pg_relation_size(i.indexrelid) >= :min_size
           ORDER BY
             pg_relation_size(i.indexrelid) DESC,
             relname ASC
         SQL
+        result = select_all_size(sql, {max_scans: max_scans.to_i, min_size: min_size.to_i})
 
         across.each do |database_id|
           database = PgHero.databases.values.find { |d| d.id == database_id }
@@ -186,7 +188,7 @@ module PgHero
       # thanks @jberkus and @mbanck
       def index_bloat(min_size: nil)
         min_size ||= index_bloat_bytes
-        select_all <<~SQL
+        sql = <<~SQL
           WITH btree_index_atts AS (
             SELECT
               nspname, relname, reltuples, relpages, indrelid, relam,
@@ -315,11 +317,12 @@ module PgHero
           INNER JOIN
             pg_index i ON i.indexrelid = rb.indexrelid
           WHERE
-            wastedbytes >= #{min_size.to_i}
+            wastedbytes >= :min_size
           ORDER BY
             wastedbytes DESC,
             index_name
         SQL
+        select_all(sql, {min_size: min_size.to_i})
       end
 
       protected

data/lib/pghero/methods/kill.rb

@@ -1,15 +1,18 @@
 module PgHero
   module Methods
     module Kill
+      # note: this method is not affected by disable_kill option
       def kill(pid)
-        select_one("SELECT pg_terminate_backend(#{pid.to_i})")
+        select_one("SELECT pg_terminate_backend(:pid)", {pid: pid.to_i})
       end
 
+      # note: this method is not affected by disable_kill option
       def kill_long_running_queries(min_duration: nil)
         running_queries(min_duration: min_duration || long_running_query_sec).each { |query| kill(query[:pid]) }
         true
       end
 
+      # note: this method is not affected by disable_kill option
       def kill_all
         select_all <<~SQL
           SELECT

data/lib/pghero/methods/maintenance.rb

@@ -6,14 +6,11 @@ module PgHero
       # once there are fewer than 1 million transactions left until wraparound"
       # warn when 10,000,000 transactions left
       def transaction_id_danger(threshold: 10000000, max_value: 2146483648)
-        max_value = max_value.to_i
-        threshold = threshold.to_i
-
-        select_all <<~SQL
+        sql = <<~SQL
           SELECT
             n.nspname AS schema,
             c.relname AS table,
-            #{quote(max_value)} - GREATEST(AGE(c.relfrozenxid), AGE(t.relfrozenxid)) AS transactions_left
+            :max_value - GREATEST(AGE(c.relfrozenxid), AGE(t.relfrozenxid)) AS transactions_left
           FROM
             pg_class c
           INNER JOIN
@@ -22,10 +19,11 @@ module PgHero
             pg_class t ON c.reltoastrelid = t.oid
           WHERE
             c.relkind = 'r'
-            AND (#{quote(max_value)} - GREATEST(AGE(c.relfrozenxid), AGE(t.relfrozenxid))) < #{quote(threshold)}
+            AND (:max_value - GREATEST(AGE(c.relfrozenxid), AGE(t.relfrozenxid))) < :threshold
           ORDER BY
            3, 1, 2
         SQL
+        select_all(sql, {max_value: max_value.to_i, threshold: threshold.to_i})
       end
 
       def autovacuum_danger
@@ -34,19 +32,15 @@ module PgHero
       end
 
       def vacuum_progress
-        if server_version_num >= 90600
-          select_all <<~SQL
-            SELECT
-              pid,
-              phase
-            FROM
-              pg_stat_progress_vacuum
-            WHERE
-              datname = current_database()
-          SQL
-        else
-          []
-        end
+        select_all <<~SQL
+          SELECT
+            pid,
+            phase
+          FROM
+            pg_stat_progress_vacuum
+          WHERE
+            datname = current_database()
+        SQL
       end
 
       def maintenance_info
@@ -68,7 +62,7 @@ module PgHero
       end
 
       def analyze(table, verbose: false)
-        execute "ANALYZE #{verbose ? "VERBOSE " : ""}#{quote_table_name(table)}"
+        execute "ANALYZE #{"VERBOSE " if verbose}#{quote_table_name(table)}"
         true
       end