rails-pg-extras 5.3.1 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079597706cc133935560397f2e136950867c90b6e2b41aca6ccbc6b48fd1ad4f'
-  data.tar.gz: 4d71766d6c5bc5bf0c7ce1e3ad2668ee9e9164594139eaf791d29c5d545b2056
+  metadata.gz: eae7b49e84af570a46a1442642dcc8a1f9abc78d660489d777715b7fde100224
+  data.tar.gz: 4fd17ae15d5dc2b0eddfd8f4770dfe062efeee119d1d797f4ffb00c4e8e369f8
 SHA512:
-  metadata.gz: 9d2940121490100a88fb546e16af06505dc838902f96f3b7dea62cdc980e00b17bf9410c44859f2c7534792b812dee0c3a1283a0a724034556852c5bede3d5ae
-  data.tar.gz: f5708d15b6a767bbbaa2c2b744e84c42c7b84720d4e292c6e0b53c8a335d40f8bf35536adfbbc643b6cc9399ed53fdbc33ac5754884202bc59efe764d874834f
+  metadata.gz: f0f610b3eea483eaf8a7d2e321a0af7a805633d70e1e473905d0aae5993f5dc70055a39cee07634f3e7dc1691cd70c77d9b25440018e0b6550645378b65aadf8
+  data.tar.gz: e506327e15ee0d8072f74b712abb4552c0dfe34b8f6dfd53149dbd439bf4bba96064d1c61bf5dfae979a46571fb9dd776382893890740648ae8bb624a932aa9c

data/.github/workflows/ci.yml

@@ -12,43 +12,52 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.2', '3.1', '3.0', '2.7', '2.6']
+        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7', '2.6']
     steps:
-      - uses: actions/checkout@v3
-      - name: Run PostgreSQL 11
+      - uses: actions/checkout@v4
+      - name: Run PostgreSQL 12
         run: |
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=rails-pg-extras-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5432:5432 postgres:11.18-alpine \
+            -d -p 5432:5432 postgres:12.20-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
-      - name: Run PostgreSQL 12
+      - name: Run PostgreSQL 13
         run: |
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=rails-pg-extras-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5433:5432 postgres:12.13-alpine \
+            -d -p 5433:5432 postgres:13.16-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
-      - name: Run PostgreSQL 13
+      - name: Run PostgreSQL 14
         run: |
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=rails-pg-extras-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5434:5432 postgres:13.9-alpine \
+            -d -p 5434:5432 postgres:14.13-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
-      - name: Run PostgreSQL 14
+      - name: Run PostgreSQL 15
         run: |
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=rails-pg-extras-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5435:5432 postgres:14.6-alpine \
+            -d -p 5435:5432 postgres:15.8-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
-      - name: Run PostgreSQL 15
+          sleep 15
+      - name: Run PostgreSQL 16
+        run: |
+          docker run --env POSTGRES_USER=postgres \
+            --env POSTGRES_DB=rails-pg-extras-test \
+            --env POSTGRES_PASSWORD=secret \
+            -d -p 5436:5432 postgres:16.4-alpine \
+            postgres -c shared_preload_libraries=pg_stat_statements
+          sleep 15
+      - name: Run PostgreSQL 17
         run: |
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=rails-pg-extras-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5436:5432 postgres:15.1-alpine \
+            -d -p 5437:5432 postgres:17.0-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
           sleep 15
       - name: Set up Ruby ${{ matrix.ruby-version }}
@@ -57,72 +66,65 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Setup dependencies
         run: |
-          gem update --system
-          gem install bundler
+          gem install bundler -v 2.4.22
           sudo apt-get update --allow-releaseinfo-change
           sudo apt install postgresql-client
           sudo apt install libpq-dev
           bundle config set --local path 'vendor/bundle'
           bundle install
           sleep 10
-      - name: Run tests for PG 11
+      - name: Run tests for PG 12
         env:
-          PG_VERSION: 11
+          PG_VERSION: 12
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5432/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
-      - name: Run tests for PG 11
+      - name: Run tests for PG 13
         env:
-          PG_VERSION: 11
+          PG_VERSION: 13
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5432/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
-      - name: Run tests for PG 12
+      - name: Run tests for PG 14
         env:
-          PG_VERSION: 12
+          PG_VERSION: 14
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5433/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
-      - name: Run tests for PG 13
+      - name: Run tests for PG 15
         env:
-          PG_VERSION: 13
+          PG_VERSION: 15
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5434/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
-      - name: Run tests for PG 14
+      - name: Run tests for PG 16
         env:
-          PG_VERSION: 14
+          PG_VERSION: 16
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5435/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
-      - name: Run tests for PG 15
+      - name: Run tests for PG 17
         env:
-          PG_VERSION: 15
+          PG_VERSION: 17
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
           POSTGRES_DB: rails-pg-extras-test
           POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5436/rails-pg-extras-test
         run: |
           bundle exec rspec spec/
 

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -6,7 +6,7 @@ Included rake tasks and Ruby methods can be used to obtain information about a P
 
 You can read this blog post for detailed step by step tutorial on how to [optimize PostgreSQL using PG Extras library](https://pawelurbanek.com/postgresql-fix-performance).
 
-**Shameless plug:** rails-pg-extras is one of the tools that I use when conducting Rails performance audits. [Check out my offer](https://pawelurbanek.com/#rails-performance-tuning) if you need help with fine-tuning your app.
+**Shameless plug:** rails-pg-extras is just one of the tools that I use when conducting [Rails performance audits](https://pawelurbanek.com/optimize-rails-performance). Check out my offer if you need help with optimizing your application.
 
 Optionally you can enable a visual interface:
 
@@ -16,6 +16,8 @@ Alternative versions:
 
 - Core dependency - [Ruby](https://github.com/pawurb/ruby-pg-extras)
 
+- [Rust](https://github.com/pawurb/rust-pg-extras)
+
 - [NodeJS](https://github.com/pawurb/node-postgres-extras)
 
 - [Elixir](https://github.com/pawurb/ecto_psql_extras)
@@ -109,6 +111,8 @@ By default, queries target the `public` schema of the database. You can specify
 RailsPgExtras.table_cache_hit(args: { schema: "my_schema" })
 ```
 
+You can customize the default `public` schema by setting `ENV['PG_EXTRAS_SCHEMA']` value.
+
 ## Diagnose report
 
 The simplest way to start using pg-extras is to execute a `diagnose` method. It runs a set of checks and prints out a report highlighting areas that may require additional investigation:
@@ -544,7 +548,7 @@ This command displays the total size of each table and materialized view in the
 ### `unused_indexes`
 
 ```ruby
-RailsPgExtras.unused_indexes(args: { max_scans: 20 })
+RailsPgExtras.unused_indexes(args: { max_scans: 50 })
 
 $ rake pg_extras:unused_indexes
 

data/Rakefile

@@ -1,10 +1,9 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Test all PG versions'
+desc "Test all PG versions"
 task :test_all do
-  system("PG_VERSION=11 bundle exec rspec spec/ && PG_VERSION=12 bundle exec rspec spec/ && PG_VERSION=13 bundle exec rspec spec/ && PG_VERSION=14 bundle exec rspec spec/")
+  system("PG_VERSION=12 bundle exec rspec spec/ && PG_VERSION=13 bundle exec rspec spec/ && PG_VERSION=14 bundle exec rspec spec/ && PG_VERSION=15 bundle exec rspec spec/ && PG_VERSION=16 bundle exec rspec spec/ && PG_VERSION=17 bundle exec rspec spec/")
 end
-

data/app/controllers/rails_pg_extras/web/application_controller.rb

@@ -9,17 +9,17 @@ module RailsPgExtras::Web
     REQUIRED_EXTENSIONS = {
       pg_stat_statements: %i[calls outliers pg_stat_statements_reset],
       pg_buffercache: %i[buffercache_stats buffercache_usage],
-      sslinfo: %i[ssl_used]
+      sslinfo: %i[ssl_used],
     }
 
     ACTIONS = %i[kill_all pg_stat_statements_reset add_extensions]
 
-    if ENV['RAILS_PG_EXTRAS_USER'].present? && ENV['RAILS_PG_EXTRAS_PASSWORD'].present?
-      http_basic_authenticate_with name: ENV.fetch('RAILS_PG_EXTRAS_USER'), password: ENV.fetch('RAILS_PG_EXTRAS_PASSWORD')
+    if ENV["RAILS_PG_EXTRAS_USER"].present? && ENV["RAILS_PG_EXTRAS_PASSWORD"].present?
+      http_basic_authenticate_with name: ENV.fetch("RAILS_PG_EXTRAS_USER"), password: ENV.fetch("RAILS_PG_EXTRAS_PASSWORD")
     end
 
     def validate_credentials!
-      if (ENV['RAILS_PG_EXTRAS_USER'].blank? || ENV['RAILS_PG_EXTRAS_PASSWORD'].blank?) && !RailsPgExtras.configuration.public_dashboard
+      if (ENV["RAILS_PG_EXTRAS_USER"].blank? || ENV["RAILS_PG_EXTRAS_PASSWORD"].blank?) && !RailsPgExtras.configuration.public_dashboard
         raise "Missing credentials for rails-pg-extras dashboard! If you want to enable public dashboard please set RAILS_PG_EXTRAS_PUBLIC_DASHBOARD=true"
       end
     end

data/app/controllers/rails_pg_extras/web/queries_controller.rb

@@ -38,7 +38,7 @@ module RailsPgExtras::Web
       return @unavailable_extensions if defined?(@unavailable_extensions)
 
       enabled_extensions = ActiveRecord::Base.connection.extensions
-      @unavailable_extensions = REQUIRED_EXTENSIONS.delete_if { |ext| ext.to_s.in?(enabled_extensions)  }
+      @unavailable_extensions = REQUIRED_EXTENSIONS.delete_if { |ext| ext.to_s.in?(enabled_extensions) }
     end
   end
 end

data/app/views/rails_pg_extras/web/queries/_diagnose.html.erb

@@ -1,7 +1,7 @@
   <h1 class="font-bold text-xl my-5">Diagnose</h1>
   <table class="w-full font-mono border-collapse border my-5">
     <% RailsPgExtras.diagnose(in_format: :hash).each do |diagnosis| %>
-      <tr class="<%= diagnosis[:ok] ? 'bg-green-300' : 'bg-red-300' %>">
+      <tr class="<%= diagnosis[:ok] ? "bg-green-300" : "bg-red-300" %>">
         <td class='p-1 border font-bold'><%= diagnosis[:check_name] %></td>
         <td class='p-1 border'><%= diagnosis[:message] %></td>
       </tr>

data/app/views/rails_pg_extras/web/queries/_unavailable_extensions_warning.html.erb

@@ -1,15 +1,15 @@
 <div class="text-red-500 p-3 font-mono my-5">
-  <% unavailable_extensions.each do |extension, queries| %>
+  <% unavailable_extensions.each do |extension, queries| %>
     WARNING: Queries <%= queries.map { |q| "<b><u>#{q}</u></b>" }.join(", ").html_safe %> require extension: <b><%= extension %></b>
     <br>
-  <% end %>
+  <% end %>
  </div>
 
-<% if RailsPgExtras::Web.action_enabled?(:add_extensions) %>
-  <%= link_to "Enable extensions", add_extensions_action_path,
-    method: "post",
-    data: {
-      confirm: "This command will enable following extensions: #{unavailable_extensions.keys.join(', ')}. Do you want to proceeed?"
-    }, class: 'border p-3 bg-green-500 text-white hover:bg-green-600 font-bold rounded' %>
-<% end %>
+<% if RailsPgExtras::Web.action_enabled?(:add_extensions) %>
+  <%= link_to "Enable extensions", add_extensions_action_path,
+              method: "post",
+              data: {
+                confirm: "This command will enable following extensions: #{unavailable_extensions.keys.join(", ")}. Do you want to proceeed?",
+              }, class: "border p-3 bg-green-500 text-white hover:bg-green-600 font-bold rounded" %>
+<% end %>
 

data/app/views/rails_pg_extras/web/queries/index.html.erb

@@ -6,20 +6,18 @@
 <h1 class="font-bold text-xl my-5">Actions</h1>
 
 <% if RailsPgExtras::Web.action_enabled?(:kill_all) %>
-  <%= link_to "kill_all",  kill_all_action_path,
-    method: "post",
-    data: {
-      confirm: "This commands kills all the currently active connections to the database. Do you want to proceed?"
-    },
-    class: 'border p-3 bg-red-500 text-white hover:bg-red-600 font-bold rounded'
-  %>
+  <%= link_to "kill_all", kill_all_action_path,
+              method: "post",
+              data: {
+                confirm: "This commands kills all the currently active connections to the database. Do you want to proceed?",
+              },
+              class: "border p-3 bg-red-500 text-white hover:bg-red-600 font-bold rounded" %>
 <% end %>
 
 <% if RailsPgExtras::Web.action_enabled?(:pg_stat_statements_reset) && unavailable_extensions.exclude?(:pg_stat_statements) %>
   <%= link_to "pg_stat_statements_reset", pg_stat_statements_reset_action_path,
-    method: "post",
-    data: {
-      confirm: "This command discards all statistics gathered so far by pg_stat_statements. Do you want to proceed?"
-    }, class: 'border p-3 bg-blue-500 text-white hover:bg-blue-600 font-bold rounded'
-  %>
+              method: "post",
+              data: {
+                confirm: "This command discards all statistics gathered so far by pg_stat_statements. Do you want to proceed?",
+              }, class: "border p-3 bg-blue-500 text-white hover:bg-blue-600 font-bold rounded" %>
 <% end %>

data/app/views/rails_pg_extras/web/queries/show.html.erb

@@ -1,19 +1,18 @@
-<%= content_for :title, params[:query_name].presence || "pg_extras" %>
-<%= render "rails_pg_extras/web/shared/queries_selector" %>
+<%= content_for :title, params[:query_name].presence || "pg_extras" %>
+<%= render "rails_pg_extras/web/shared/queries_selector" %>
 
-<% if @error %>
+<% if @error %>
   <div class="text-red-500 p-3 font-mono my-5"><%= @error %></div>
-<% else %>
-  <% if @result&.any? %>
-    <%= render "result",
-      title: RubyPgExtras.description_for(query_name: @query_name),
-      headers: @result[0].keys,
-      rows: @result.values
-    %>
-  <% else %>
+<% else %>
+  <% if @result&.any? %>
+    <%= render "result",
+               title: RubyPgExtras.description_for(query_name: @query_name),
+               headers: @result[0].keys,
+               rows: @result.values %>
+  <% else %>
    <div class="font-mono p-3 bg-gray-100 mt-3">No results</div>
-  <% end %>
-<% end %>
+  <% end %>
+<% end %>
 
 <style>
 @media print {

data/app/views/rails_pg_extras/web/shared/_queries_selector.html.erb

@@ -1,8 +1,7 @@
-<%= form_tag queries_path, id: "queries", method: :get do |f| %>
-  <%= select_tag :query_name, options_for_select(@all_queries, params[:query_name]),
-    {prompt: "--- select query ---", class: "border p-2 font-bold", autofocus: true}
-  %>
-<% end %>
+<%= form_tag queries_path, id: "queries", method: :get do |f| %>
+  <%= select_tag :query_name, options_for_select(@all_queries, params[:query_name]),
+                 { prompt: "--- select query ---", class: "border p-2 font-bold", autofocus: true } %>
+<% end %>
 
 <%= javascript_tag nonce: true do -%>
   document.getElementById('queries').addEventListener('change', (e) => {

data/config/routes.rb

@@ -1,9 +1,9 @@
 RailsPgExtras::Web::Engine.routes.draw do
   resources :queries, only: [:index]
 
-  post "/actions/kill_all" => "actions#kill_all", as: :kill_all_action
-  post "/actions/pg_stat_statements_reset" => "actions#pg_stat_statements_reset", as: :pg_stat_statements_reset_action
-  post "/actions/add_extensions" => "actions#add_extensions", as: :add_extensions_action
+  post "/actions/kill_all", to: "actions#kill_all", as: :kill_all_action
+  post "/actions/pg_stat_statements_reset", to: "actions#pg_stat_statements_reset", as: :pg_stat_statements_reset_action
+  post "/actions/add_extensions", to: "actions#add_extensions", as: :add_extensions_action
 
   root to: "queries#index"
 end

data/docker-compose.yml.sample

@@ -1,8 +1,6 @@
-version: '3'
-
 services:
-  postgres11:
-    image: postgres:11.16-alpine
+  postgres12:
+    image: postgres:12.20-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -10,8 +8,8 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5432:5432'
-  postgres12:
-    image: postgres:12.11-alpine
+  postgres13:
+    image: postgres:13.16-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -19,8 +17,8 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5433:5432'
-  postgres13:
-    image: postgres:13.7-alpine
+  postgres14:
+    image: postgres:14.13-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -28,8 +26,8 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5434:5432'
-  postgres14:
-    image: postgres:14.3-alpine
+  postgres15:
+    image: postgres:15.8-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -37,3 +35,22 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5435:5432'
+  postgres16:
+    image: postgres:16.4-alpine
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: rails-pg-extras-test
+      POSTGRES_PASSWORD: secret
+    ports:
+      - '5436:5432'
+  postgres17:
+    image: postgres:17.0-alpine
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: rails-pg-extras-test
+      POSTGRES_PASSWORD: secret
+    ports:
+      - '5437:5432'
+

data/lib/rails-pg-extras.rb

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
 
-require 'terminal-table'
-require 'ruby-pg-extras'
-require 'rails_pg_extras/diagnose_data'
-require 'rails_pg_extras/diagnose_print'
-require 'rails_pg_extras/index_info'
-require 'rails_pg_extras/index_info_print'
-require 'rails_pg_extras/table_info'
-require 'rails_pg_extras/table_info_print'
+require "terminal-table"
+require "ruby-pg-extras"
+require "rails_pg_extras/diagnose_data"
+require "rails_pg_extras/diagnose_print"
+require "rails_pg_extras/index_info"
+require "rails_pg_extras/index_info_print"
+require "rails_pg_extras/table_info"
+require "rails_pg_extras/table_info_print"
 
 module RailsPgExtras
   QUERIES = RubyPgExtras::QUERIES
   DEFAULT_ARGS = RubyPgExtras::DEFAULT_ARGS
   NEW_PG_STAT_STATEMENTS = RubyPgExtras::NEW_PG_STAT_STATEMENTS
+  PG_STAT_STATEMENTS_17 = RubyPgExtras::PG_STAT_STATEMENTS_17
 
   QUERIES.each do |query_name|
     define_singleton_method query_name do |options = {}|
       run_query(
         query_name: query_name,
         in_format: options.fetch(:in_format, :display_table),
-        args: options.fetch(:args, {})
+        args: options.fetch(:args, {}),
       )
     end
   end
@@ -30,25 +31,27 @@ module RailsPgExtras
                                         FROM pg_available_extensions
                                         WHERE name = 'pg_stat_statements'"
       if (version = RailsPgExtras.connection.execute(pg_stat_statements_version_sql)
-            .to_a[0].fetch("installed_version", nil))
+        .to_a[0].fetch("installed_version", nil))
         if Gem::Version.new(version) < Gem::Version.new(NEW_PG_STAT_STATEMENTS)
           query_name = "#{query_name}_legacy".to_sym
+        elsif Gem::Version.new(version) >= Gem::Version.new(PG_STAT_STATEMENTS_17)
+          query_name = "#{query_name}_17".to_sym
         end
       end
     end
 
     sql = if (custom_args = DEFAULT_ARGS[query_name].merge(args)) != {}
-      RubyPgExtras.sql_for(query_name: query_name) % custom_args
-    else
-      RubyPgExtras.sql_for(query_name: query_name)
-    end
+        RubyPgExtras.sql_for(query_name: query_name) % custom_args
+      else
+        RubyPgExtras.sql_for(query_name: query_name)
+      end
 
     result = connection.execute(sql)
 
     RubyPgExtras.display_result(
       result,
       title: RubyPgExtras.description_for(query_name: query_name),
-      in_format: in_format
+      in_format: in_format,
     )
   end
 
@@ -76,10 +79,10 @@ module RailsPgExtras
     sql_duration = 0
 
     method_name = if ActiveSupport::Notifications.respond_to?(:monotonic_subscribe)
-      :monotonic_subscribe
-    else
-      :subscribe
-    end
+        :monotonic_subscribe
+      else
+        :subscribe
+      end
 
     subscriber = ActiveSupport::Notifications.public_send(method_name, "sql.active_record") do |_name, start, finish, _id, payload|
       unless payload[:name] =~ /SCHEMA/
@@ -115,11 +118,10 @@ module RailsPgExtras
       count: queries.reduce(0) { |agg, val| agg + val[1].fetch(:count) },
       queries: queries,
       total_duration: total_duration.round(2),
-      sql_duration: sql_duration.round(2)
+      sql_duration: sql_duration.round(2),
     }
   end
 
-
   def self.index_info(args: {}, in_format: :display_table)
     data = RailsPgExtras::IndexInfo.call(args[:table_name])
 
@@ -149,7 +151,7 @@ module RailsPgExtras
   end
 
   def self.connection
-    if (db_url = ENV['RAILS_PG_EXTRAS_DATABASE_URL'])
+    if (db_url = ENV["RAILS_PG_EXTRAS_DATABASE_URL"])
       ActiveRecord::Base.establish_connection(db_url).connection
     else
       ActiveRecord::Base.connection
@@ -157,6 +159,6 @@ module RailsPgExtras
   end
 end
 
-require 'rails_pg_extras/web'
-require 'rails_pg_extras/configuration'
-require 'rails_pg_extras/railtie' if defined?(Rails)
+require "rails_pg_extras/web"
+require "rails_pg_extras/configuration"
+require "rails_pg_extras/railtie" if defined?(Rails)

data/lib/rails_pg_extras/diagnose_data.rb

@@ -2,7 +2,6 @@
 
 module RailsPgExtras
   class DiagnoseData < ::RubyPgExtras::DiagnoseData
-
     private
 
     def query_module

data/lib/rails_pg_extras/diagnose_print.rb

@@ -2,7 +2,6 @@
 
 module RailsPgExtras
   class DiagnosePrint < ::RubyPgExtras::DiagnosePrint
-
     private
 
     def title

data/lib/rails_pg_extras/railtie.rb

@@ -2,6 +2,6 @@
 
 class RailsPgExtras::Railtie < Rails::Railtie
   rake_tasks do
-    load 'rails_pg_extras/tasks/all.rake'
+    load "rails_pg_extras/tasks/all.rake"
   end
 end

data/lib/rails_pg_extras/tasks/all.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'rails-pg-extras'
+require "rails-pg-extras"
 
 namespace :pg_extras do
   RailsPgExtras::QUERIES.each do |query_name|

data/lib/rails_pg_extras/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgExtras
-  VERSION = "5.3.1"
+  VERSION = "5.4.1"
 end

data/lib/rails_pg_extras/web/engine.rb

@@ -1,4 +1,4 @@
-require 'rails'
+require "rails"
 
 module RailsPgExtras::Web
   class Engine < ::Rails::Engine

data/rails-pg-extras.gemspec

@@ -1,24 +1,25 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rails_pg_extras/version'
+require "rails_pg_extras/version"
 
 Gem::Specification.new do |s|
-  s.name          = "rails-pg-extras"
-  s.version       = RailsPgExtras::VERSION
-  s.authors       = ["pawurb"]
-  s.email         = ["contact@pawelurbanek.com"]
-  s.summary       = %q{ Rails PostgreSQL performance database insights }
-  s.description   = %q{ Rails port of Heroku PG Extras. The goal of this project is to provide a powerful insights into PostgreSQL database for Ruby on Rails apps that are not using the default Heroku PostgreSQL plugin. }
-  s.homepage      = "http://github.com/pawurb/rails-pg-extras"
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = s.files.grep(%r{^(spec)/})
+  s.name = "rails-pg-extras"
+  s.version = RailsPgExtras::VERSION
+  s.authors = ["pawurb"]
+  s.email = ["contact@pawelurbanek.com"]
+  s.summary = %q{ Rails PostgreSQL performance database insights }
+  s.description = %q{ Rails port of Heroku PG Extras. The goal of this project is to provide a powerful insights into PostgreSQL database for Ruby on Rails apps that are not using the default Heroku PostgreSQL plugin. }
+  s.homepage = "http://github.com/pawurb/rails-pg-extras"
+  s.files = `git ls-files`.split("\n")
+  s.test_files = s.files.grep(%r{^(spec)/})
   s.require_paths = ["lib"]
-  s.license       = "MIT"
+  s.license = "MIT"
   s.add_dependency "ruby-pg-extras", RailsPgExtras::VERSION
   s.add_dependency "rails"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rufo"
 
   if s.respond_to?(:metadata=)
     s.metadata = { "rubygems_mfa_required" => "true" }

data/spec/smoke_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-require 'rails-pg-extras'
+require "spec_helper"
+require "rails-pg-extras"
 
 describe RailsPgExtras do
   RailsPgExtras::QUERIES.each do |query_name|
@@ -9,7 +9,7 @@ describe RailsPgExtras do
       expect do
         RailsPgExtras.run_query(
           query_name: query_name,
-          in_format: :hash
+          in_format: :hash,
         )
       end.not_to raise_error
     end
@@ -35,12 +35,13 @@ describe RailsPgExtras do
   end
 
   it "supports custom RAILS_PG_EXTRAS_DATABASE_URL" do
-    ENV['RAILS_PG_EXTRAS_DATABASE_URL'] = ENV['DATABASE_URL']
+    ENV["RAILS_PG_EXTRAS_DATABASE_URL"] = ENV["DATABASE_URL"]
+    puts ENV["RAILS_PG_EXTRAS_DATABASE_URL"]
 
     expect do
       RailsPgExtras.calls
     end.not_to raise_error
 
-    ENV['RAILS_PG_EXTRAS_DATABASE_URL'] = nil
+    ENV["RAILS_PG_EXTRAS_DATABASE_URL"] = nil
   end
 end

data/spec/spec_helper.rb

@@ -1,23 +1,27 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'bundler/setup'
-require 'active_record'
-require_relative '../lib/rails-pg-extras'
+require "rubygems"
+require "bundler/setup"
+require "active_record"
+require_relative "../lib/rails-pg-extras"
 
 pg_version = ENV["PG_VERSION"]
 
-port = if pg_version == "11"
-  "5432"
-elsif pg_version == "12"
-  "5433"
-elsif pg_version == "13"
-  "5434"
-elsif pg_version == "14"
-  "5435"
-else
-  "5432"
-end
+port = if pg_version == "12"
+    "5432"
+  elsif pg_version == "13"
+    "5433"
+  elsif pg_version == "14"
+    "5434"
+  elsif pg_version == "15"
+    "5435"
+  elsif pg_version == "16"
+    "5436"
+  elsif pg_version == "17"
+    "5437"
+  else
+    "5432"
+  end
 
 ENV["DATABASE_URL"] ||= "postgresql://postgres:secret@localhost:#{port}/rails-pg-extras-test"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-extras
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.1
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-pg-extras
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: 5.4.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rufo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " Rails port of Heroku PG Extras. The goal of this project is to provide
   a powerful insights into PostgreSQL database for Ruby on Rails apps that are not
   using the default Heroku PostgreSQL plugin. "
@@ -132,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Rails PostgreSQL performance database insights