pghero 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 725af86da804f9f7869d727483cdc077de020c77cf5d364abecb943db6b2e7e9
-  data.tar.gz: 0e15c553a23d7288711f1b16e619ffff6cc38bbb26a1539477ed6f7eb11e2e6b
+  metadata.gz: a7dc52d94fbdd96a3efcef37d4739855cb5e9ab0da76c53d345141c3a0f28021
+  data.tar.gz: 6e1640fb5ff339f5d0523d7acebb4655c0426b877a2a6545e53fb0af386769da
 SHA512:
-  metadata.gz: 435b20217db356ac5d28450d92a5f96d44fef1ea3a2b909f8d9c713393f3dee3f9fea9e2be6737320280d1663dbab20fb19165d01b70d4842ea6f32978bb0465
-  data.tar.gz: edab3df03d6a47681f9fff134d0fc5fa070fa5262d74092948aa76ade0dbba2977ef885120894ec0cb4a1e007b46454373c529239cb4fc1f002b2d8702dba17e
+  metadata.gz: d1ad10cfe918c2ab278af7aa96fcf5b08ccce3b6454f9630d7a628c9be0d54d0d3f5110d9ec4ab9248ee42556bba66166347412d284074820ed35069292ce72f
+  data.tar.gz: 4a7cc686fb1074c827a21e5b9ee8ce5a82119926b05e9ea8cdacd31759765932767df2638bd0790543e5f252507c97863c9572be7112be22244927396d93dce7

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 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)

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

@@ -5,7 +5,7 @@
 
     <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", nonce: true %>
     <% else %>

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.match?(/postg/i)
+        unless @connection_model.connection_db_config.adapter.to_s.match?(/postg/i)
           raise Error, "Invalid connection URL"
         end
         @adapter_checked = true

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,13 +31,18 @@ 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
@@ -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/suggested_indexes.rb

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module PgHero
-  VERSION = "3.6.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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pghero
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
+date: 2024-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: A performance dashboard for Postgres