rails-pg-extras 5.6.12 → 5.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ab5f408e9c0a7f70fea16a4d8d2e5079b130c8bb3536a2da760aa8cc509b1cf
-  data.tar.gz: 39a83a3ce09da9710884277245c2306ab70b3584f32885651f4553a7faf0ebbb
+  metadata.gz: 527209c0372ab51aa819a88d39fca67a8608c4c19c1f05e7229faa2b8fbce050
+  data.tar.gz: 2dd5e86b330f95e680e495d3d02bab62dfd809462e90a125e9d5f592b20cc700
 SHA512:
-  metadata.gz: 23302e3cf2afab6463cf306dc9d7274d0da0364080e105559260b47f93ec3c55bfb7faed12185f7119a6b4a64fb64568ce637e03a8cef4188fe983039753218d
-  data.tar.gz: 00bf2ca5b4c857ba53063f3063501d5d2d4a5b561256aef79de379b921461d041e5e50bf4667480d06a2aafad986c8c95b2437ca0cd0f87b457f62e6388104e2
+  metadata.gz: 02ab457a4fa05efd333e585e8413d5ea6817463a063fd4d9f546f05882ca7698d9e55f9640ee7390002afeb9bf1e637e61e24abe79487f2a788b7d2587bdb26c
+  data.tar.gz: 8d9ecd37ac60697ddbae46fd2e955cc26b35d56ce8252913247f552bed552b235d2eebe6adca1759e09628dfe644e656cf384ca78146b40a4b1c44cb13c21088

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/lib/rails-pg-extras.rb

@@ -148,9 +148,37 @@ 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?
+    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?
       connector = ActiveRecord::Base.establish_connection(db_url)
 
       if connector.respond_to?(:connection)

data/lib/rails_pg_extras/version.rb

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

data/rails-pg-extras.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license = "MIT"
   s.add_dependency "ruby-pg-extras", RailsPgExtras::VERSION
-  s.add_dependency "rails"
+  s.add_dependency "railties"
+  s.add_dependency "actionpack"
+  s.add_dependency "activerecord"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rufo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-extras
 version: !ruby/object:Gem::Version
-  version: 5.6.12
+  version: 5.6.14
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-13 00:00:00.000000000 Z
+date: 2025-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-pg-extras
@@ -16,16 +16,44 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.12
+        version: 5.6.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.6.12
+        version: 5.6.14
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,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