active_record_proxy_adapters 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b1c4f2efd94125b178e043fa1162ab6d8d8edb7a9041eb10b8244c606b3c59
-  data.tar.gz: fb74c76ed0dc0865c9756c3188a92dd248ce58ef4832811704c15a59b728991e
+  metadata.gz: b80e3ab832bc332967c0f4840f9f35563725497e61a48339c46e4f65a15b2458
+  data.tar.gz: fc85aed94e09aa25bd15e46102ae318f9b790bc2bb67a24243c2340952ff4fa2
 SHA512:
-  metadata.gz: 3730cca00342dd7f44944305bfdd53f158da2bc8d09b39883645a2b1a581297904dce121c10de5bc351e30b999b1bcd59457bd3309280074fb36d716a22bdcae
-  data.tar.gz: 07d42f0c57bdd203a260a7d55010159318db260f95ed5483049e8a6ac771908df7696d05692a3043f0a54d77f4e2623c6aa08b7ddda2db5a79e634224db78b12
+  metadata.gz: 5a81cf2441d0f1548311474fbaa3326b9d2fbccc0b25c481408f0f99ce6634710dc589e0aed60f63ca55e5debe2635eb4cd6a75c2a0cf444fb7929292dc02dac
+  data.tar.gz: c4bd34a35fa68b8257a5839b99055efdd11d18ce436afea98fd695475c4dae7cfda7ecc26fc2aed61f0981258c65684f22185c6d8fddc143ceb06b400b9219b1

data/CHANGELOG.md

@@ -1,20 +1,37 @@
 ## [Unreleased]
 
-- Fix replica connection pool getter when database configurations have multiple replicas
-- Retrieve replica pool without checking out a connection
+- Handle PendingMigrationConnection introduced by Rails 7.2 and backported to Rails 7.1
+- Stick to same connection throughout request span
+
+## [0.2.1] - 2025-01-02
+
+- Fix replica connection pool getter when specific connection name is not found https://github.com/Nasdaq/active_record_proxy_adapters/commit/847e150dd21c5bc619745ee1d9d8fcaa9b8f2eea
+
+## [0.2.0] - 2024-12-24
+
+- Add custom log subscriber to tag queries based on the adapter being used https://github.com/Nasdaq/active_record_proxy_adapters/commit/68b8c1f4191388eb957bf12e0f84289da667e940
+
+## [0.1.4] - 2025-01-02
+
+- Fix replica connection pool getter when specific connection name is not found https://github.com/Nasdaq/active_record_proxy_adapters/commit/88b32a282b54d420e652f638656dbcf063ac8796
+
+## [0.1.3] - 2024-12-24
+
+- Fix replica connection pool getter when database configurations have multiple replicas https://github.com/Nasdaq/active_record_proxy_adapters/commit/ea5a33997da45ac073f166b3fbd2d12426053cd6
+- Retrieve replica pool without checking out a connection https://github.com/Nasdaq/active_record_proxy_adapters/commit/6470ef58e851082ae1f7a860ecdb5b451ef903c8
 
 ## [0.1.2] - 2024-12-16
 
-- Fix CTE regex matcher (4b1d10b)
+- Fix CTE regex matcher https://github.com/Nasdaq/active_record_proxy_adapters/commit/4b1d10bfd952fb1f5b102de8cc1a5bd05d25f5e9
 
 ## [0.1.1] - 2024-11-27
 
-- Enable RubyGems MFA (2a71b1f)
+- Enable RubyGems MFA https://github.com/Nasdaq/active_record_proxy_adapters/commit/2a71b1f4354fb966cc0aa68231ca5837814e07ee
 
 ## [0.1.0] - 2024-11-19
 
-- Add PostgreSQLProxyAdapter (2b3bb9f)
+- Add PostgreSQLProxyAdapter https://github.com/Nasdaq/active_record_proxy_adapters/commit/2b3bb9f7359139519b32af3018ceb07fed8c6b33
 
 ## [0.1.0.rc2] - 2024-10-28
 
-- Add PostgreSQLProxyAdapter (2b3bb9f)
+- Add PostgreSQLProxyAdapter https://github.com/Nasdaq/active_record_proxy_adapters/commit/2b3bb9f7359139519b32af3018ceb07fed8c6b33

data/Dockerfile

@@ -8,7 +8,7 @@ RUN apk --update add \
     build-base \
     git \
     postgresql-dev \
-    postgresql-client
+    postgresql17-client
 RUN gem install bundler -v 2.5.13
 
 COPY . /app

data/README.md

@@ -1,5 +1,7 @@
 # ActiveRecordProxyAdapters
 
+[![Run Test Suite](https://github.com/Nasdaq/active_record_proxy_adapters/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/Nasdaq/active_record_proxy_adapters/actions/workflows/test.yml)
+
 A set of ActiveRecord adapters that leverage Rails native multiple database setup to allow automatic connection switching from _one_ primary pool to _one_ replica pool at the database statement level.
 
 ## Installation

data/db/postgresql_structure.sql

@@ -1,6 +1,7 @@
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
+SET transaction_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
@@ -9,16 +10,18 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;
 
---
--- Name: public; Type: SCHEMA; Schema: -; Owner: -
---
+SET default_tablespace = '';
 
--- *not* creating schema, since initdb creates it
+SET default_table_access_method = heap;
 
+--
+-- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -
+--
 
-SET default_tablespace = '';
+CREATE TABLE public.schema_migrations (
+    version character varying(255) NOT NULL
+);
 
-SET default_table_access_method = heap;
 
 --
 -- Name: users; Type: TABLE; Schema: public; Owner: -
@@ -68,6 +71,13 @@ ALTER TABLE ONLY public.users
     ADD CONSTRAINT users_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING btree (version);
+
+
 --
 -- PostgreSQL database dump complete
 --

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -62,7 +62,7 @@ module ActiveRecordProxyAdapters
 
     attr_reader :primary_connection, :last_write_at, :active_record_context
 
-    delegate :connection_handler, :connected_to_stack, to: :connection_class
+    delegate :connection_handler, to: :connection_class
     delegate :reading_role, :writing_role, to: :active_record_context
 
     def replica_pool_unavailable?
@@ -70,9 +70,18 @@ module ActiveRecordProxyAdapters
     end
 
     def replica_pool
+      # use default handler if the connection pool for specific class is not found
+      specific_replica_pool || default_replica_pool
+    end
+
+    def specific_replica_pool
       connection_handler.retrieve_connection_pool(connection_class.name, role: reading_role)
     end
 
+    def default_replica_pool
+      connection_handler.retrieve_connection_pool(ActiveRecord::Base.name, role: reading_role)
+    end
+
     def connection_class
       active_record_context.connection_class_for(primary_connection)
     end
@@ -111,11 +120,25 @@ module ActiveRecordProxyAdapters
       [reading_role, writing_role].include?(role) ? role : nil
     end
 
+    def connected_to_stack
+      return connection_class.connected_to_stack if connection_class.respond_to?(:connected_to_stack)
+
+      # handle Rails 7.2+ pending migrations Connection
+      return [{ role: writing_role }] if pending_migration_connection?
+
+      []
+    end
+
+    def pending_migration_connection?
+      active_record_context.active_record_v7_1_or_greater? &&
+        connection_class.name == "ActiveRecord::PendingMigrationConnection"
+    end
+
     def connection_for(role, sql_string)
       connection = primary_connection if role == writing_role || replica_pool_unavailable?
       connection ||= checkout_replica_connection
 
-      result = yield(connection)
+      result = connected_to(role:) { yield connection }
 
       update_primary_latest_write_timestamp if !replica_connection?(connection) && write_statement?(sql_string)
 
@@ -124,6 +147,12 @@ module ActiveRecordProxyAdapters
       replica_connection?(connection) && replica_pool.checkin(connection)
     end
 
+    def connected_to(role:, &block)
+      return block.call unless connection_class.respond_to?(:connected_to)
+
+      connection_class.connected_to(role:, &block)
+    end
+
     def replica_connection?(connection)
       connection && connection != primary_connection
     end

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/postgres_primary.dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/postgres:14-alpine
+FROM docker.io/postgres:17-alpine
 
 ARG REPLICA_USER=replicator
 ARG REPLICA_PASSWORD=replicator

data/postgres_replica.dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/postgres:14-alpine
+FROM docker.io/postgres:17-alpine
 
 ENV PRIMARY_DATABASE_HOST=localhost
 ENV PRIMARY_DATABASE_PORT=5432

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Matt Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,7 +67,6 @@ files:
 - Dockerfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - db/postgresql_structure.sql
 - docker-compose.yml
 - docker/postgres_replica/cmd.sh

data/Rakefile

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]
-
-desc "Prepares the database environment for use"
-task :environment do
-  $LOAD_PATH << File.expand_path("lib", __dir__)
-  require "active_record_proxy_adapters"
-  require "active_record_proxy_adapters/connection_handling"
-  ActiveRecord::Base.extend ActiveRecordProxyAdapters::ConnectionHandling
-  require_relative "spec/test_helper"
-
-  TestHelper.setup_active_record_config
-
-  $stdout.puts "Environment loaded: #{TestHelper.env_name}"
-end
-
-namespace :db do # rubocop:disable Metrics/BlockLength
-  desc "Drops all databases"
-  task drop: %i[drop:postgresql]
-
-  namespace :drop do
-    desc "Drops the postgresql database"
-    task postgresql: :environment do
-      TestHelper.drop_database
-    end
-  end
-
-  desc "Creates all databases"
-  task create: %i[create:postgresql]
-
-  namespace :create do
-    desc "Creates the postgresql database"
-    task postgresql: :environment do
-      TestHelper.create_database
-    end
-  end
-
-  namespace :schema do
-    desc "Loads all schemas onto their respective databases"
-    task load: %i[load:postgresql]
-
-    namespace :load do
-      desc "Loads the schema into the postgresql database from schema_path. Default is db/postgresql_structure.sql"
-      task :postgresql, [:schema_path] => :environment do |_task, args|
-        args.with_defaults(schema_path: "db/postgresql_structure.sql")
-        TestHelper.load_schema(args.schema_path)
-      end
-    end
-  end
-
-  desc "Creates a all databases and loads their schemas"
-  task setup: %i[create schema:load]
-
-  namespace :setup do
-    desc "Creates the postgresql database and loads the schema"
-    task postgresql: %i[create:postgresql schema:load:postgresql]
-  end
-end
-
-namespace :coverage do
-  desc "Collates all result sets generated by the different test runners"
-  task :report do
-    require "simplecov"
-
-    SimpleCov.collate Dir["coverage/**/.resultset.json"] do
-      add_group "PostgreSQL" do |src_file|
-        [/postgresql/, /postgre_sql/].any? { |pattern| pattern.match?(src_file.filename) }
-      end
-    end
-  end
-end