active_record_proxy_adapters 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fc4961ba1a8bce59f560d529b55eb965cd27971d92772f95f57b7a21bce30c
-  data.tar.gz: 9c5c16ed9546f3be6df5e191e20483bb2177473b6c934ac589035a75771189e9
+  metadata.gz: efb046fb2816644ce048912c4c2666ae00f90fd728800f867cbe79bab99a59f3
+  data.tar.gz: 3d193415b9063dcfb5633c8e1493c20742f8cfbf06bc0baa7efccb291c727b49
 SHA512:
-  metadata.gz: 8a97f02e6e212666c43490ebebe13957a9226103fb59ab2142de1905a10cc6357372314736f79fb86e141b5efdff0bfc1078a89e4205a52e53c80daf6df6b073
-  data.tar.gz: b8d947651861fbbe6227c5ef6cc670c72a73bd58126c228d1cc6fe253327531e6b1ef299b51ea69402bd986380134be5d39308fdaaa9fc075f127b22ee37ee8d
+  metadata.gz: 8faf6efe63b55a9f00bbd4664f862abd3f0dd729f22b4e59306515a5dcd0fefbd42077cfaafc39f33f75d23eedd11a861e9284ba38c15868c69f72956d3acbbb
+  data.tar.gz: 91717a29aca4d6c41c71436527adb72cac844a4d19a2707eb5111d4f5f8b42b3c017990bdcc77972b48a7fa32082b02f74328a4c86b4f87cebc776b1d1641a17

data/CHANGELOG.md

@@ -1,30 +1,37 @@
 ## [Unreleased]
 
+- 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 (847e150dd21c5bc619745ee1d9d8fcaa9b8f2eea)
+- 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 (68b8c1f4191388eb957bf12e0f84289da667e940)
+- 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 (ea5a33997da45ac073f166b3fbd2d12426053cd6)
-- Retrieve replica pool without checking out a connection (6470ef58e851082ae1f7a860ecdb5b451ef903c8)
+- 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 (4b1d10bfd952fb1f5b102de8cc1a5bd05d25f5e9)
+- Fix CTE regex matcher https://github.com/Nasdaq/active_record_proxy_adapters/commit/4b1d10bfd952fb1f5b102de8cc1a5bd05d25f5e9
 
 ## [0.1.1] - 2024-11-27
 
-- Enable RubyGems MFA (2a71b1f4354fb966cc0aa68231ca5837814e07ee)
+- Enable RubyGems MFA https://github.com/Nasdaq/active_record_proxy_adapters/commit/2a71b1f4354fb966cc0aa68231ca5837814e07ee
 
 ## [0.1.0] - 2024-11-19
 
-- Add PostgreSQLProxyAdapter (2b3bb9f7359139519b32af3018ceb07fed8c6b33)
+- Add PostgreSQLProxyAdapter https://github.com/Nasdaq/active_record_proxy_adapters/commit/2b3bb9f7359139519b32af3018ceb07fed8c6b33
 
 ## [0.1.0.rc2] - 2024-10-28
 
-- Add PostgreSQLProxyAdapter (2b3bb9f7359139519b32af3018ceb07fed8c6b33)
+- 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.
 
 ## Why do I need this?

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?
@@ -120,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)
 
@@ -133,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.2.1"
+  VERSION = "0.2.2"
 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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord