rails-pg-extras 5.6.13 → 5.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60cca18682745f6e881da4c4e856b05682709e5678478e4bd490af6645d26d39
-  data.tar.gz: 3850f7f49166b8d9e22f884145877d7c3d3796bedb8ce6daa44b6e1d19ed30db
+  metadata.gz: e1b176294ac8dfee0602dac9a7719b685cbe2b4303bf96421853a87a1f7fdd1b
+  data.tar.gz: 2a9208ba3675bda0ff32fa6da55cf68f8bcfa70b1ecdf51d3456d505acaf56a9
 SHA512:
-  metadata.gz: 93125c50d81473b96e221f57e11675fbb66c48280a7378a9bc2d7ba96e42250323aa4f2abb92dc6c0ea0fc17603b2d43768e2e25c6a5e871fc45a48e259ee213
-  data.tar.gz: 46967984fe94e997316c673a95606eb19703400c10625334574c66473f1bb2a522355da3ef1a9252eebdd06f259f49d1e698b000a9221ff41166236acde26c9f
+  metadata.gz: 6fde9b532cc4afeb2581405cb11f51d965de7d5a68f7dd89feddf2646a9d1c2281b354a8f7a67d74378758f8f1cacf6658dabac8dc8d9b30f2b387231fb23dc9
+  data.tar.gz: 341f88edb6018e20d42994f9520961a0f5fc0c0a82118d4ceff76b626ef86188d7f9253b92b964048036555ab819b56eead63943cfa3f1e364871c051f4c9d5b

data/.github/workflows/ci.yml

@@ -15,13 +15,6 @@ jobs:
         ruby-version: ['3.4', '3.3', '3.2', '3.1', '3.0', '2.7']
     steps:
       - 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:12.20-alpine \
-            postgres -c shared_preload_libraries=pg_stat_statements
       - name: Run PostgreSQL 13
         run: |
           docker run --env POSTGRES_USER=postgres \
@@ -57,6 +50,13 @@ jobs:
             --env POSTGRES_PASSWORD=secret \
             -d -p 5437:5432 postgres:17.0-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
+      - name: Run PostgreSQL 18
+        run: |
+          docker run --env POSTGRES_USER=postgres \
+            --env POSTGRES_DB=rails-pg-extras-test \
+            --env POSTGRES_PASSWORD=secret \
+            -d -p 5438:5432 postgres:18.1-alpine \
+            postgres -c shared_preload_libraries=pg_stat_statements
           sleep 5
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
@@ -71,11 +71,6 @@ jobs:
           bundle config set --local path 'vendor/bundle'
           bundle install
           sleep 10
-      - name: Run tests for PG 12
-        env:
-          PG_VERSION: 12
-        run: |
-          bundle exec rspec spec/
       - name: Run tests for PG 13
         env:
           PG_VERSION: 13
@@ -101,4 +96,9 @@ jobs:
           PG_VERSION: 17
         run: |
           bundle exec rspec spec/
+      - name: Run tests for PG 18
+        env:
+          PG_VERSION: 18
+        run: |
+          bundle exec rspec spec/
 

data/README.md

@@ -158,6 +158,22 @@ RailsPgExtras.configure do |config|
 end
 ```
 
+You can also configure a default ignore list for the heuristic missing foreign key constraints checker. This helps skip columns that you know should not be considered foreign keys.
+
+```ruby
+RailsPgExtras.configure do |config|
+  # Accepts an Array or a comma-separated String of entries like:
+  # - "posts.category_id" (ignore a specific table+column)
+  # - "category_id"       (ignore this column name for all tables)
+  # - "posts.*"           (ignore all columns on a table)
+  # - "*"                 (ignore everything)
+  config.missing_fk_constraints_ignore_list = ["posts.category_id", "category_id"]
+
+  # Or as a comma-separated string:
+  # config.missing_fk_constraints_ignore_list = "posts.category_id, category_id"
+end
+```
+
 ## Available methods
 
 ### `measure_queries`
@@ -262,6 +278,26 @@ RailsPgExtras.missing_fk_constraints(args: { table_name: "users" })
 
 `table_name` argument is optional, if omitted, method will display missing fk constraints for all the tables.
 
+You can optionally pass an `ignore_list` to skip known false positives detected by the heuristic checker. It accepts an Array or a comma-separated String. Entries can be:
+- "posts.category_id" to ignore a specific table+column
+- "category_id" to ignore a column name for all tables
+- "posts.*" to ignore all columns on a specific table
+- "*" to ignore everything
+
+Examples:
+
+```ruby
+# Per-call ignore list
+RailsPgExtras.missing_fk_constraints(args: {
+  ignore_list: ["posts.category_id", "legacy_id", "temp_tables.*"]
+})
+
+# As a comma-separated string
+RailsPgExtras.missing_fk_constraints(args: {
+  ignore_list: "posts.category_id, legacy_id, temp_tables.*"
+})
+```
+
 ### `table_schema`
 
 This method displays structure of a selected table, listing its column names, together with types, null constraints, and default values.

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

@@ -3,6 +3,8 @@ require "rails_pg_extras/version"
 
 module RailsPgExtras::Web
   class ApplicationController < ActionController::Base
+    around_action :with_selected_database
+    before_action :load_available_databases
     def self.get_user
       Rails.application.try(:credentials).try(:pg_extras).try(:user) || ENV["RAILS_PG_EXTRAS_USER"]
     end
@@ -31,5 +33,36 @@ module RailsPgExtras::Web
         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
+
+    private
+
+    def with_selected_database
+      Thread.current[:rails_pg_extras_db_key] = params[:db_key].presence
+      yield
+    ensure
+      Thread.current[:rails_pg_extras_db_key] = nil
+    end
+
+    def load_available_databases
+      @available_databases = fetch_available_database_names
+      @current_db_key = params[:db_key].presence || default_db_key
+    end
+
+    def fetch_available_database_names
+
+      ActiveRecord::Base.configurations
+            .configs_for(env_name: Rails.env)
+            .filter_map { |conf| (conf.respond_to?(:name) && conf.name) || (conf.respond_to?(:spec_name) && conf.spec_name) }
+            .uniq
+            .sort
+
+    rescue
+      []
+    end
+
+    def default_db_key
+      # Prefer primary if available, else first available
+      @available_databases.include?("primary") ? "primary" : @available_databases.first
+    end
   end
 end

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

@@ -39,7 +39,7 @@ module RailsPgExtras::Web
     def unavailable_extensions
       return @unavailable_extensions if defined?(@unavailable_extensions)
 
-      enabled_extensions = ActiveRecord::Base.connection.extensions.lazy
+      enabled_extensions = RailsPgExtras.connection.extensions.lazy
       @unavailable_extensions = REQUIRED_EXTENSIONS.delete_if { |ext| enabled_extensions.grep(/^([^.]+\.)?#{ext}$/).any? }
     end
   end

data/app/views/layouts/rails_pg_extras/web/application.html.erb

@@ -21,6 +21,10 @@
       </div>
     <% end %>
 
+    <div class="mb-4">
+      <%= render "rails_pg_extras/web/shared/database_selector" %>
+    </div>
+
     <%= yield %>
   </body>
 </html>

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

@@ -2,24 +2,32 @@
 <div class='pg-extras-help pb-4'>
     (<a href="https://pawelurbanek.com/postgresql-fix-performance" 
        class="text-blue-600 hover:text-blue-800 hover:underline" target='_blank'>Tutorial</a>)
-</div>
-<div class="overflow-x-auto">
-  <table class="w-full border border-gray-400 shadow-md rounded-lg overflow-hidden">
-    <thead>
-      <tr class="bg-gray-200 text-gray-900 text-left uppercase text-sm font-bold">
-        <th class="px-4 py-3 border">Ok</th>
-        <th class="px-4 py-3 border">Check Name</th>
-        <th class="px-4 py-3 border">Message</th>
-      </tr>
-    </thead>
-    <tbody>
-      <% RailsPgExtras.diagnose(in_format: :hash).each do |diagnosis| %>
-        <tr class="<%= diagnosis[:ok] ? "bg-green-100 text-green-900" : "bg-red-100 text-red-900" %> hover:bg-gray-300 transition">
-          <td class="px-4 py-3 border font-bold"><%= diagnosis[:ok] ? "YES" : "NO" %></td>
-          <td class="px-4 py-3 border font-semibold"><%= diagnosis[:check_name] %></td>
-          <td class="px-4 py-3 border"><%= diagnosis[:message] %></td>
+  </div>
+<% begin %>
+  <% diagnoses = RailsPgExtras.diagnose(in_format: :hash) %>
+  <div class="overflow-x-auto">
+    <table class="w-full border border-gray-400 shadow-md rounded-lg overflow-hidden">
+      <thead>
+        <tr class="bg-gray-200 text-gray-900 text-left uppercase text-sm font-bold">
+          <th class="px-4 py-3 border">Ok</th>
+          <th class="px-4 py-3 border">Check Name</th>
+          <th class="px-4 py-3 border">Message</th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+      </thead>
+      <tbody>
+        <% diagnoses.each do |diagnosis| %>
+          <tr class="<%= diagnosis[:ok] ? "bg-green-100 text-green-900" : "bg-red-100 text-red-900" %> hover:bg-gray-300 transition">
+            <td class="px-4 py-3 border font-bold"><%= diagnosis[:ok] ? "YES" : "NO" %></td>
+            <td class="px-4 py-3 border font-semibold"><%= diagnosis[:check_name] %></td>
+            <td class="px-4 py-3 border"><%= diagnosis[:message] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% rescue => e %>
+  <div class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4" role="alert">
+    <p class="font-bold">Diagnose failed</p>
+    <p><%= e.message %></p>
+  </div>
+<% end %>

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

@@ -0,0 +1,16 @@
+<% if @available_databases.present? && @available_databases.size > 1 %>
+  <%= form_tag queries_path, id: "db_selector", method: :get, class: "mb-4 flex items-center gap-2" do %>
+    <label for="db_key" class="font-semibold">Database:</label>
+    <%= select_tag :db_key,
+                   options_for_select(@available_databases, @current_db_key),
+                   class: "border p-2 font-bold" %>
+    <%# Preserve current query selection if present %>
+    <%= hidden_field_tag :query_name, params[:query_name] if params[:query_name].present? %>
+  <% end %>
+
+  <%= javascript_tag nonce: true do -%>
+    document.getElementById('db_selector').addEventListener('change', (e) => {
+      e.target.form.submit()
+    })
+  <% end -%>
+<% end %>

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

@@ -1,7 +1,9 @@
-<%= form_tag queries_path, id: "queries", method: :get do |f| %>
-  <%= select_tag :query_name, options_for_select(@all_queries, params[:query_name]),
-                 { prompt: "diagnose", 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: "diagnose", class: "border p-2 font-bold", autofocus: true } %>
+  <%# Preserve selected database across query changes %>
+  <%= hidden_field_tag :db_key, params[:db_key] if params[:db_key].present? %>
+<% end %>
 
 <%= javascript_tag nonce: true do -%>
   document.getElementById('queries').addEventListener('change', (e) => {

data/docker-compose.yml.sample

@@ -1,13 +1,4 @@
 services:
-  postgres12:
-    image: postgres:12.20-alpine
-    command: postgres -c shared_preload_libraries=pg_stat_statements
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_DB: rails-pg-extras-test
-      POSTGRES_PASSWORD: secret
-    ports:
-      - '5432:5432'
   postgres13:
     image: postgres:13.16-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
@@ -45,7 +36,7 @@ services:
     ports:
       - '5436:5432'
   postgres17:
-    image: postgres:17.0-alpine
+    image: postgres:17.7-alpine
     command: postgres -c shared_preload_libraries=pg_stat_statements
     environment:
       POSTGRES_USER: postgres
@@ -53,4 +44,13 @@ services:
       POSTGRES_PASSWORD: secret
     ports:
       - '5437:5432'
+  postgres18:
+    image: postgres:18.1-alpine
+    command: postgres -c shared_preload_libraries=pg_stat_statements
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_DB: rails-pg-extras-test
+      POSTGRES_PASSWORD: secret
+    ports:
+      - '5438:5432'
 

data/lib/rails-pg-extras.rb

@@ -139,7 +139,9 @@ module RailsPgExtras
   end
 
   def self.missing_fk_constraints(args: {}, in_format: :display_table)
-    result = RailsPgExtras::MissingFkConstraints.call(args[:table_name])
+    ignore_list = args[:ignore_list]
+    ignore_list ||= RailsPgExtras.configuration.missing_fk_constraints_ignore_list
+    result = RailsPgExtras::MissingFkConstraints.call(args[:table_name], ignore_list: ignore_list)
     RubyPgExtras.display_result(result, title: "Missing foreign key constraints", in_format: in_format)
   end
 
@@ -148,10 +150,50 @@ module RailsPgExtras
   end
 
   def self.connection
+    # Priority:
+    # 1) Per-request selected db (thread-local), if present -> use named configuration or URL without altering global Base
+    # 2) Explicit URL via setter or ENV override
+    # 3) Default ActiveRecord::Base connection
+    selected_db_key = Thread.current[:rails_pg_extras_db_key]
     db_url = @@database_url || ENV["RAILS_PG_EXTRAS_DATABASE_URL"]
 
-    if db_url.present?
-      connector = ActiveRecord::Base.establish_connection(db_url)
+    if selected_db_key.present?
+      const_name = selected_db_key.classify
+      # Use an isolated abstract class to avoid changing the global connection
+      thread_classes = (Thread.current[:rails_pg_extras_ar_classes] ||= {})
+      ar_class = (thread_classes[selected_db_key] ||= begin
+        if const_defined?(const_name, false)
+          const_get(const_name, false)
+        else
+          klass = Class.new(ActiveRecord::Base)
+          klass.abstract_class = true
+          const_set(const_name, klass)
+        end
+      end)
+
+      connector = ar_class.establish_connection(selected_db_key.to_sym)
+
+      if connector.respond_to?(:connection)
+        connector.connection
+      elsif connector.respond_to?(:lease_connection)
+        connector.lease_connection
+      else
+        raise "Unsupported connector: #{connector.class}"
+      end
+    elsif db_url.present?
+      # Use an isolated abstract class to avoid changing the global connection
+      thread_classes = (Thread.current[:rails_pg_extras_ar_classes] ||= {})
+      ar_class = (thread_classes[:database_url] ||= begin
+        if const_defined?(:PgExtrasURLConn, false)
+          const_get(:PgExtrasURLConn, false)
+        else
+          klass = Class.new(ActiveRecord::Base)
+          klass.abstract_class = true
+          const_set(:PgExtrasURLConn, klass)
+        end
+      end)
+
+      connector = ar_class.establish_connection(db_url)
 
       if connector.respond_to?(:connection)
         connector.connection

data/lib/rails_pg_extras/configuration.rb

@@ -4,14 +4,16 @@ require "rails_pg_extras/web"
 
 module RailsPgExtras
   class Configuration
-    DEFAULT_CONFIG = { enabled_web_actions: Web::ACTIONS - [:kill_all, :kill_pid], public_dashboard: ENV["RAILS_PG_EXTRAS_PUBLIC_DASHBOARD"] == "true" }
+    DEFAULT_CONFIG = { enabled_web_actions: Web::ACTIONS - [:kill_all, :kill_pid], public_dashboard: ENV["RAILS_PG_EXTRAS_PUBLIC_DASHBOARD"] == "true", missing_fk_constraints_ignore_list: [] }
 
     attr_reader :enabled_web_actions
     attr_accessor :public_dashboard
+    attr_accessor :missing_fk_constraints_ignore_list
 
     def initialize(attrs)
       self.enabled_web_actions = attrs[:enabled_web_actions]
       self.public_dashboard = attrs[:public_dashboard]
+      self.missing_fk_constraints_ignore_list = attrs[:missing_fk_constraints_ignore_list]
     end
 
     def enabled_web_actions=(*actions)

data/lib/rails_pg_extras/version.rb

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

data/spec/smoke_spec.rb

@@ -66,4 +66,15 @@ describe RailsPgExtras do
       }.not_to raise_error
     end
   end
+
+  it "database_url does not affect global connection" do
+    original_connection = ActiveRecord::Base.connection
+
+    RailsPgExtras.database_url = ENV["DATABASE_URL"]
+    RailsPgExtras.calls
+    RailsPgExtras.database_url = nil
+
+    # Verify global connection unchanged
+    expect(ActiveRecord::Base.connection).to eq(original_connection)
+  end
 end

data/spec/spec_helper.rb

@@ -8,15 +8,15 @@ require_relative "../lib/rails-pg-extras"
 pg_version = ENV["PG_VERSION"]
 
 PG_PORTS = {
-  "12" => "5432",
   "13" => "5433",
   "14" => "5434",
   "15" => "5435",
   "16" => "5436",
   "17" => "5437",
+  "18" => "5438",
 }
 
-port = PG_PORTS.fetch(pg_version, "5432")
+port = PG_PORTS.fetch(pg_version, "5438")
 
 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.6.13
+  version: 5.6.15
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-07 00:00:00.000000000 Z
+date: 2025-12-16 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.6.13
+        version: 5.6.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.13
+        version: 5.6.15
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - app/views/rails_pg_extras/web/queries/_unavailable_extensions_warning.html.erb
 - app/views/rails_pg_extras/web/queries/index.html.erb
 - app/views/rails_pg_extras/web/queries/show.html.erb
+- app/views/rails_pg_extras/web/shared/_database_selector.html.erb
 - app/views/rails_pg_extras/web/shared/_queries_selector.html.erb
 - assets/pg-extras-rails-ujs.js
 - assets/pg-extras-tailwind.min.css