pghero 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344a413582024c07e65a19f69e4e5a8aa5bd9024d40ce82357ce234349c8f52f
-  data.tar.gz: a9c4c8f537f9e2067582d9dba2b44f7fd83b43ed8ab6cc5aeaeaa04107087e96
+  metadata.gz: 7edafa3113ab1d1e6dd6df9c2abb1fe90ccd1077811475c001cfef05c021e8d9
+  data.tar.gz: f7e65b01aa540e9023c30c9cefcbf2fd7381fb71b24852043c82e81e878bc8f7
 SHA512:
-  metadata.gz: 3b7999bab7e77cba83016ed05dde01778f4e79cbe4fa5982750dfedfe46c74438f2700d13ff8e07744c92f1a4c87b2c740bf455921d6004f047a57d2aa982720
-  data.tar.gz: eb91e9b0f35115de7369e521cfa5c0c39854f4d2e8ea650782af2fd28a465e825daa5f7a1f485b6944c00dc7f14855524c034cd7f953d93a4f55718d43110183
+  metadata.gz: 857502906ac831709d69a371f4da5ca2bce260f55f72731f3db48be28b159d0816080e2dd90f87301653c609dc5d0dd27ec36d0e58f0649c45d18e9046851bc0
+  data.tar.gz: f54eb2b5e13a75b691fcb3efcc3b63d921a33194caf2f4d62147f8d7090faa4cfa70abfc379315bed61378176f2ef8919747990ed9ba8ff4f3886a32f54edbd3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.2.1
+
+- Added `config_path` option
+- Fixed error with sequences when temporary tables
+- Fixed error when `config.action_controller.include_all_helpers = false`
+
 ## 2.2.0
 
 - Added check for connections idle in transaction

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 Andrew Kane, 2008-2014 Heroku (initial queries)
+Copyright (c) 2014-2019 Andrew Kane, 2008-2014 Heroku (initial queries)
 
 MIT License
 

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

@@ -4,15 +4,23 @@
  *= require_self
  */
 
+html {
+  box-sizing: border-box;
+  font-size: 14px;
+}
+
+*, *:before, *:after {
+  box-sizing: inherit;
+}
+
 body {
   margin: 0;
   padding: 20px;
   background-color: #eee;
 }
 
-body, textarea {
-  font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
-  font-size: 14px;
+body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
   line-height: 1.4;
   color: #333;
 }
@@ -30,7 +38,6 @@ table {
   width: 100%;
   border-collapse: collapse;
   border-spacing: 0;
-  margin-bottom: 20px;
   table-layout: fixed;
 }
 
@@ -40,13 +47,11 @@ th {
 }
 
 h1 {
-  margin-top: 0;
   font-size: 20px;
   font-weight: bold;
 }
 
 h2 {
-  margin-top: 0;
   font-size: 16px;
   font-weight: bold;
 }
@@ -57,8 +62,13 @@ h1 small {
   color: #999;
 }
 
-h1, p {
-  margin-bottom: 20px;
+h1, h2, p, ul, hr, table, pre {
+  margin-top: 0;
+  margin-bottom: 1rem;
+}
+
+.field {
+  margin-bottom: 0.5rem;
 }
 
 h3 {
@@ -66,16 +76,16 @@ h3 {
 }
 
 ul {
+  list-style-type: disc;
+  padding-left: 20px;
+}
+
+ul.nav {
   list-style-type: none;
   padding: 0;
   margin: 0;
 }
 
-ul.list-normal {
-  list-style-type: disc;
-  padding-left: 20px;
-}
-
 table td, table th {
   padding: 8px;
 }
@@ -98,13 +108,13 @@ textarea {
   height: 120px;
   border: solid 1px #ddd;
   padding: 10px;
+  font-size: inherit;
 }
 
 hr {
   border: none;
   height: 0;
   border-top: solid 1px #ddd;
-  margin-bottom: 15px;
 }
 
 .container {

data/app/controllers/pg_hero/home_controller.rb

@@ -171,9 +171,9 @@ module PgHero
         if @show_details
           query_hash_stats = @database.query_hash_stats(@query_hash, user: @user)
 
-          @chart_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at], (r[:total_minutes] * 60 * 1000).round] }, library: chart_library_options}]
-          @chart2_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at], r[:average_time].round(1)] }, library: chart_library_options}]
-          @chart3_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at], r[:calls]] }, library: chart_library_options}]
+          @chart_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at].change(sec: 0), (r[:total_minutes] * 60 * 1000).round] }, library: chart_library_options}]
+          @chart2_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at].change(sec: 0), r[:average_time].round(1)] }, library: chart_library_options}]
+          @chart3_data = [{name: "Value", data: query_hash_stats.map { |r| [r[:captured_at].change(sec: 0), r[:calls]] }, library: chart_library_options}]
 
           @origins = Hash[query_hash_stats.group_by { |r| r[:origin].to_s }.map { |k, v| [k, v.size] }]
           @total_count = query_hash_stats.size
@@ -286,7 +286,7 @@ module PgHero
 
     def kill
       if @database.kill(params[:pid])
-        redirect_to root_path, notice: "Query killed"
+        redirect_backward notice: "Query killed"
       else
         redirect_backward notice: "Query no longer running"
       end

data/app/helpers/pg_hero/{base_helper.rb → home_helper.rb}

@@ -1,5 +1,5 @@
 module PgHero
-  module BaseHelper
+  module HomeHelper
     def pghero_pretty_ident(table, schema: nil)
       ident = table
       if schema && schema != "public"
@@ -11,5 +11,9 @@ module PgHero
         @database.quote_ident(ident)
       end
     end
+
+    def pghero_js_var(name, value)
+      "var #{name} = #{json_escape(value.to_json(root: false))};".html_safe
+    end
   end
 end

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

@@ -5,12 +5,12 @@
 </div>
 
 <script>
-  var sort = <%= @sort.to_json.html_safe %>;
-  var minAverageTime = <%= @min_average_time.to_json %>;
-  var minCalls = <%= @min_calls.to_json %>;
-  var debug = <%= @debug.to_json %>;
-  var startAt = <%= params[:start_at] ? @start_at.to_i * 1000 : "null" %>;
-  var endAt = <%= @end_at.to_i %> * 1000;
+  <%= pghero_js_var("sort", @sort) %>
+  <%= pghero_js_var("minAverageTime", @min_average_time) %>
+  <%= pghero_js_var("minCalls", @min_calls) %>
+  <%= pghero_js_var("debug", @debug) %>
+  <%= pghero_js_var("startAt", params[:start_at] ? @start_at.to_i * 1000 : nil) %>
+  <%= pghero_js_var("endAt", @end_at.to_i * 1000) %>
 
   initSlider();
 </script>

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

@@ -2,7 +2,7 @@
   <h1>Explain</h1>
 
   <%= form_tag explain_path do %>
-    <%= text_area_tag :query, @query, placeholder: "Enter a SQL query" %>
+    <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 "Analyze", class: "btn btn-danger", style: "margin-right: 10px;" %>
@@ -16,7 +16,7 @@
     <% end %>
     <pre><code><%= @explanation %></code></pre>
     <% unless @visualize %>
-      <p><%= link_to "See how to interpret this", "http://www.postgresql.org/docs/current/static/using-explain.html", target: "_blank" %></p>
+      <p><%= link_to "See how to interpret this", "https://www.postgresql.org/docs/current/static/using-explain.html", target: "_blank" %></p>
     <% end %>
     <% if (index = @suggested_index) %>
       <%= render partial: "suggested_index", locals: {index: index, details: index[:details]} %>

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

@@ -89,7 +89,7 @@
             <td><%= table %></td>
             <td><%= @row_counts[table] %></td>
             <td>
-              <ul class="list-normal">
+              <ul>
                 <% @indexes_by_table[table].to_a.sort_by { |i| [i[:primary] ? 0 : 1, i[:columns]] }.each do |i3| %>
                   <li>
                     <%= i3[:columns].join(", ") %><% if i3[:using] != "btree" %>

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

@@ -3,24 +3,24 @@ databases:
     # Database URL (defaults to app database)
     # url: <%%= ENV["DATABASE_URL"] %>
 
-    # Minimum time for long running queries
-    # long_running_query_sec: 60
+  # Add more databases
+  # other:
+  #   url: <%%= ENV["OTHER_DATABASE_URL"] %>
 
-    # Minimum average time for slow queries
-    # slow_query_ms: 20
+# Minimum time for long running queries
+# long_running_query_sec: 60
 
-    # Minimum calls for slow queries
-    # slow_query_calls: 100
+# Minimum average time for slow queries
+# slow_query_ms: 20
 
-    # Minimum connections for high connections warning
-    # total_connections_threshold: 500
+# Minimum calls for slow queries
+# slow_query_calls: 100
 
-    # Statement timeout for explain
-    # explain_timeout_sec: 10
+# Minimum connections for high connections warning
+# total_connections_threshold: 500
 
-  # Add more databases
-  # other:
-  #   url: <%%= ENV["OTHER_DATABASE_URL"] %>
+# Statement timeout for explain
+# explain_timeout_sec: 10
 
 # Time zone (defaults to app time zone)
 # time_zone: "Pacific Time (US & Canada)"

data/lib/pghero.rb

@@ -1,5 +1,6 @@
-require "pghero/version"
-require "active_record"
+# dependencies
+require "active_support"
+require "forwardable"
 
 # methods
 require "pghero/methods/basic"
@@ -21,18 +22,18 @@ require "pghero/methods/users"
 
 require "pghero/database"
 require "pghero/engine" if defined?(Rails)
-
-# models
-require "pghero/connection"
-require "pghero/query_stats"
+require "pghero/version"
 
 module PgHero
+  autoload :Connection, "pghero/connection"
+  autoload :QueryStats, "pghero/query_stats"
+
   class Error < StandardError; end
   class NotEnabled < Error; end
 
   # settings
   class << self
-    attr_accessor :long_running_query_sec, :slow_query_ms, :slow_query_calls, :explain_timeout_sec, :total_connections_threshold, :cache_hit_rate_threshold, :env, :show_migrations
+    attr_accessor :long_running_query_sec, :slow_query_ms, :slow_query_calls, :explain_timeout_sec, :total_connections_threshold, :cache_hit_rate_threshold, :env, :show_migrations, :config_path
   end
   self.long_running_query_sec = (ENV["PGHERO_LONG_RUNNING_QUERY_SEC"] || 60).to_i
   self.slow_query_ms = (ENV["PGHERO_SLOW_QUERY_MS"] || 20).to_i
@@ -42,6 +43,7 @@ module PgHero
   self.cache_hit_rate_threshold = 99
   self.env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
   self.show_migrations = true
+  self.config_path = ENV["PGHERO_CONFIG_PATH"] || "config/pghero.yml"
 
   class << self
     extend Forwardable
@@ -68,7 +70,10 @@ module PgHero
 
     def config
       @config ||= begin
-        path = "config/pghero.yml"
+        require "erb"
+        require "yaml"
+
+        path = config_path
 
         config_file_exists = File.exist?(path)
 

data/lib/pghero/database.rb

@@ -75,9 +75,9 @@ module PgHero
           end
           case url
           when String
-            url = "#{url}#{url.include?("?") ? "&" : "?"}connect_timeout=2" unless url.include?("connect_timeout=")
+            url = "#{url}#{url.include?("?") ? "&" : "?"}connect_timeout=5" unless url.include?("connect_timeout=")
           when Hash
-            url[:connect_timeout] ||= 2
+            url[:connect_timeout] ||= 5
           end
           establish_connection url if url
         end

data/lib/pghero/methods/basic.rb

@@ -27,7 +27,7 @@ module PgHero
       end
 
       def quote_ident(value)
-        quote_table_name(value)
+        connection.quote_column_name(value)
       end
 
       private
@@ -37,7 +37,7 @@ module PgHero
         # squish for logs
         retries = 0
         begin
-          result = conn.select_all(squish(sql))
+          result = conn.select_all(add_source(squish(sql)))
           cast_method = ActiveRecord::VERSION::MAJOR < 5 ? :type_cast : :cast_value
           result.map { |row| Hash[row.map { |col, val| [col.to_sym, result.column_types[col].send(cast_method, val)] }] }
         rescue ActiveRecord::StatementInvalid => e
@@ -73,7 +73,7 @@ module PgHero
       end
 
       def execute(sql)
-        connection.execute(sql)
+        connection.execute(add_source(sql))
       end
 
       def connection
@@ -95,6 +95,10 @@ module PgHero
         str.to_s.gsub(/\A[[:space:]]+/, "").gsub(/[[:space:]]+\z/, "").gsub(/[[:space:]]+/, " ")
       end
 
+      def add_source(sql)
+        "#{sql} /*pghero*/"
+      end
+
       def quote(value)
         connection.quote(value)
       end

data/lib/pghero/methods/kill.rb

@@ -5,8 +5,8 @@ module PgHero
         select_one("SELECT pg_terminate_backend(#{pid.to_i})")
       end
 
-      def kill_long_running_queries
-        long_running_queries.each { |query| kill(query[:pid]) }
+      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
 

data/lib/pghero/methods/replication.rb

@@ -10,7 +10,7 @@ module PgHero
 
       # https://www.postgresql.org/message-id/CADKbJJWz9M0swPT3oqe8f9+tfD4-F54uE6Xtkh4nERpVsQnjnw@mail.gmail.com
       def replication_lag
-        with_feature_support do
+        with_feature_support(:replication_lag) do
           lag_condition =
             if server_version_num >= 100000
               "pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn()"
@@ -31,7 +31,7 @@ module PgHero
 
       def replication_slots
         if server_version_num >= 90400
-          with_feature_support([]) do
+          with_feature_support(:replication_slots, []) do
             select_all <<-SQL
               SELECT
                 slot_name,
@@ -46,18 +46,26 @@ module PgHero
       end
 
       def replicating?
-        with_feature_support(false) do
+        with_feature_support(:replicating?, false) do
           select_all("SELECT state FROM pg_stat_replication").any?
         end
       end
 
       private
 
-      def with_feature_support(default = nil)
+      def feature_support
+        @feature_support ||= {}
+      end
+
+      def with_feature_support(cache_key, default = nil)
+        # cache feature support to minimize errors in logs
+        return default if feature_support[cache_key] == false
+
         begin
           yield
         rescue ActiveRecord::StatementInvalid => e
           raise unless e.message.start_with?("PG::FeatureNotSupported:")
+          feature_support[cache_key] = false
           default
         end
       end

data/lib/pghero/methods/sequences.rb

@@ -5,6 +5,8 @@ module PgHero
         # get columns with default values
         # use pg_get_expr to get correct default value
         # it's what information_schema.columns uses
+        # also, exclude temporary tables to prevent error
+        # when accessing across sessions
         sequences = select_all <<-SQL
           SELECT
             n.nspname AS table_schema,
@@ -24,6 +26,7 @@ module PgHero
             NOT a.attisdropped
             AND a.attnum > 0
             AND d.adsrc LIKE 'nextval%'
+            AND n.nspname NOT LIKE 'pg\\_temp\\_%'
         SQL
 
         # parse out sequence

data/lib/pghero/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,7 +129,7 @@ files:
 - app/assets/stylesheets/pghero/arduino-light.css
 - app/assets/stylesheets/pghero/jquery.nouislider.css
 - app/controllers/pg_hero/home_controller.rb
-- app/helpers/pg_hero/base_helper.rb
+- app/helpers/pg_hero/home_helper.rb
 - app/views/layouts/pg_hero/application.html.erb
 - app/views/pg_hero/home/_connections_table.html.erb
 - app/views/pg_hero/home/_live_queries_table.html.erb
@@ -197,8 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A performance dashboard for Postgres