active_record_proxy_adapters 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5fc4961ba1a8bce59f560d529b55eb965cd27971d92772f95f57b7a21bce30c
-  data.tar.gz: 9c5c16ed9546f3be6df5e191e20483bb2177473b6c934ac589035a75771189e9
+  metadata.gz: 1f614128aa280355a9bc8c83e29805fc36c81f8389c017489c848e075a5510c3
+  data.tar.gz: d28585b2d7d1f7645dfc89007890a2c35ee19c4acc6de1b850e4f3b792cc0c07
 SHA512:
-  metadata.gz: 8a97f02e6e212666c43490ebebe13957a9226103fb59ab2142de1905a10cc6357372314736f79fb86e141b5efdff0bfc1078a89e4205a52e53c80daf6df6b073
-  data.tar.gz: b8d947651861fbbe6227c5ef6cc670c72a73bd58126c228d1cc6fe253327531e6b1ef299b51ea69402bd986380134be5d39308fdaaa9fc075f127b22ee37ee8d
+  metadata.gz: b3e36b3fe27bce5b1bdb9035fc399362f99d25062d97abc9024c02a30a8c6a328a2de3bdacda5682622c812f38f8b4a1da48d76e687131d3a6e07e44be4c6995
+  data.tar.gz: 053d2cfdea1db5699cd18404e8b22524a826012534eb0e077b307102021adeccde565f9e7b6417dbbe053669464a7220ab3e1e2cb3b92201cc0b296e8f23f5ce

data/CHANGELOG.md

@@ -1,30 +1,41 @@
 ## [Unreleased]
 
+- Add Mysql2ProxyAdapter
+
+## [0.2.2, 0.1.5] - 2025-01-02
+
+- Handle PendingMigrationConnection introduced by Rails 7.2 and backported to Rails 7.1 https://github.com/Nasdaq/active_record_proxy_adapters/commit/793562694c05d554bad6e14637b34e5f9ffd2fc5
+- Stick to same connection throughout request span https://github.com/Nasdaq/active_record_proxy_adapters/commit/789742fd7a33ecd555a995e8a1e1336455caec75
+
 ## [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,9 @@ RUN apk --update add \
     build-base \
     git \
     postgresql-dev \
-    postgresql-client
+    postgresql17-client \
+    mariadb-client \
+    mariadb-dev
 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?
@@ -31,8 +33,19 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 ### On Rails
 
-In `config/database.yml`, use `postgresql_proxy` as the adapter for the `primary` database, and keep `postgresql` for the replica database.
+In `config/database.yml`, use `{your_database_adapter}_proxy` as the adapter for the `primary` database, and keep `{your_database_adapter}` for the replica database.
+
+Currently supported adapters:
+
+- `postgresql`
+- `mysql2`
+
+Coming soon:
+- `trilogy`
+- `sqlite`
+
 
+#### PostgreSQL
 ```yaml
 # config/database.yml
 development:
@@ -46,6 +59,20 @@ development:
     # your replica credentials here
 ```
 
+#### MySQL
+```yaml
+# config/database.yml
+development:
+  primary:
+    adapter: mysql2_proxy
+    # your primary credentials here
+
+  primary_replica:
+    adapter: mysql2
+    replica: true
+    # your replica credentials here
+```
+
 ```ruby
 # app/models/application_record.rb
 class ApplicationRecord < ActiveRecord::Base
@@ -88,7 +115,7 @@ end
 
 ## Configuration
 
-The gem comes preconfigured out of the box. However, if default configuration does not suit your needs, you can modify them by using a `.configure` block:
+The gem comes preconfigured out of the box. However, if default configuration does not suit your needs, you can modify it by using a `.configure` block:
 
 ```ruby
 # config/initializers/active_record_proxy_adapters.rb
@@ -237,6 +264,7 @@ end
 
 # app/models/portal.rb
 class Portal < ApplicationRecord
+  validates :name, uniqueness: true
 end
 
 # in rails console -e test
@@ -244,13 +272,17 @@ ActiveRecord::Base.logger.formatter = proc do |_severity, _time, _progname, msg|
   "[#{Time.current.iso8601} THREAD #{Thread.current[:name]}] #{msg}\n"
 end
 
+ActiveRecordProxyAdapters.configure do |config|
+  config.proxy_delay = 2.seconds
+end
+
 def read_your_own_writes
   proc do
     Portal.all.count # should go to the replica
-    FactoryBot.create(:portal)
+    Portal.create(name: 'Read your own write')
 
     5.times do
-      Portal.all.count # first one goes the primary, last 3 should go to the replica
+      Portal.all.count # first one goes the primary, last 4 should go to the replica
       sleep(3)
     end
   end
@@ -295,9 +327,8 @@ irb(main):051:0> test_multithread_queries
 [2024-12-24T13:52:40-05:00 THREAD USE REPLICA]   [PostgreSQL Replica] Portal Count (1.4ms)  SELECT COUNT(*) FROM "portals"
 [2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQL Replica] Portal Count (0.4ms)  SELECT COUNT(*) FROM "portals"
 [2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] TRANSACTION (0.5ms)  BEGIN
-[2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Exists? (1.2ms)  SELECT 1 AS one FROM "portals" WHERE "portals"."id" IS NOT NULL AND "portals"."slug" = $1 LIMIT $2  [["slug", "portal-e065948fbbee73d3b2c576b48c2b37e021115158edc6a92390d613640460e1d4"], ["LIMIT", 1]]
-[2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Exists? (0.4ms)  SELECT 1 AS one FROM "portals" WHERE "portals"."name" = $1 LIMIT $2  [["name", "Portal-e065948fbbee73d3b2c576b48c2b37e021115158edc6a92390d613640460e1d4"], ["LIMIT", 1]]
-[2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Create (0.8ms)  INSERT INTO "portals" ("name", "slug", "logo", "created_at", "updated_at", "visible") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Portal-e065948fbbee73d3b2c576b48c2b37e021115158edc6a92390d613640460e1d4"], ["slug", "portal-e065948fbbee73d3b2c576b48c2b37e021115158edc6a92390d613640460e1d4"], ["logo", nil], ["created_at", "2024-12-24 18:52:40.428383"], ["updated_at", "2024-12-24 18:52:40.428383"], ["visible", true]]
+[2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Exists? (0.4ms)  SELECT 1 AS one FROM "portals" WHERE "portals"."name" = $1 LIMIT $2  [["name", "Read your own write"], ["LIMIT", 1]]
+[2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Create (0.8ms)  INSERT INTO "portals" ("name", "created_at", "updated_at") VALUES ($1, $2, $3) RETURNING "id"  [["name", "Read your own write"], ["created_at", "2024-12-24 18:52:40.428383"], ["updated_at", "2024-12-24 18:52:40.428383"]]
 [2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] TRANSACTION (0.7ms)  COMMIT
 [2024-12-24T13:52:40-05:00 THREAD READ YOUR OWN WRITES]   [PostgreSQLProxy Primary] Portal Count (0.6ms)  SELECT COUNT(*) FROM "portals"
 [2024-12-24T13:52:41-05:00 THREAD USE REPLICA]   [PostgreSQL Replica] Portal Count (4.4ms)  SELECT COUNT(*) FROM "portals"

data/db/mysql_structure.sql

@@ -0,0 +1,41 @@
+/*M!999999\- enable the sandbox mode */ 
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
+DROP TABLE IF EXISTS `schema_migrations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `schema_migrations` (
+  `version` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `name` text NOT NULL,
+  `email` text NOT NULL,
+  `created_at` timestamp NULL DEFAULT current_timestamp(),
+  `updated_at` timestamp NULL DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
+

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/docker-compose.yml

@@ -31,12 +31,22 @@ services:
       PG_REPLICA_PASSWORD: postgres_primary_test
       PG_REPLICA_HOST: postgres_replica
       PG_REPLICA_PORT: 5432
+      MYSQL_PRIMARY_USER: root
+      MYSQL_PRIMARY_PASSWORD: mysql
+      MYSQL_PRIMARY_HOST: mysql_primary
+      MYSQL_PRIMARY_PORT: 3306
+      MYSQL_REPLICA_USER: root
+      MYSQL_REPLICA_PASSWORD: mysql
+      MYSQL_REPLICA_HOST: mysql_primary
+      MYSQL_REPLICA_PORT: 3306
     depends_on:
       - postgres_primary
       - postgres_replica
+      - mariadb
     networks:
       - app
       - postgres
+      - mariadb
     volumes:
       - .:/app
   postgres_primary:
@@ -70,9 +80,19 @@ services:
       PRIMARY_DATABASE_HOST: postgres_primary
     depends_on:
       - postgres_primary
+  # TODO: create mysql replica images
+  mariadb:
+    image: mariadb:11.4
+    container_name: mysql_primary
+    environment:
+      MARIADB_ROOT_PASSWORD: mysql
+      MARIADB_DATABASE: mysql
+    ports:
+      - "3306:3306"
+    networks:
+      - mariadb
+
 networks:
   app:
   postgres:
-
-volumes:
-  postgres_primary:
+  mariadb:

data/lib/active_record/connection_adapters/mysql2_proxy_adapter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "active_record/tasks/mysql2_proxy_database_tasks"
+require "active_record/connection_adapters/mysql2_adapter"
+require "active_record_proxy_adapters/active_record_context"
+require "active_record_proxy_adapters/hijackable"
+require "active_record_proxy_adapters/mysql2_proxy"
+
+module ActiveRecord
+  module ConnectionAdapters
+    # This adapter is a proxy to the original Mysql2Adapter, allowing the use of the
+    # ActiveRecordProxyAdapters::PrimaryReplicaProxy.
+    class Mysql2ProxyAdapter < Mysql2Adapter
+      include ActiveRecordProxyAdapters::Hijackable
+
+      ADAPTER_NAME = "Mysql2Proxy"
+
+      delegate_to_proxy :execute, :exec_query
+
+      def initialize(...)
+        @proxy = ActiveRecordProxyAdapters::Mysql2Proxy.new(self)
+
+        super
+      end
+
+      private
+
+      attr_reader :proxy
+    end
+  end
+end
+
+if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_2_or_greater?
+  ActiveRecord::ConnectionAdapters.register(
+    "mysql2_proxy",
+    "ActiveRecord::ConnectionAdapters::Mysql2ProxyAdapter",
+    "active_record/connection_adapters/mysql2_proxy_adapter"
+  )
+end

data/lib/active_record/tasks/mysql2_proxy_database_tasks.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_record_proxy_adapters/database_tasks"
+
+module ActiveRecord
+  module Tasks
+    # Defines the mysql tasks for dropping, creating, loading schema and dumping schema.
+    # Bypasses all the proxy logic to send all requests to primary.
+    class Mysql2ProxyDatabaseTasks < MySQLDatabaseTasks
+      include ActiveRecordProxyAdapters::DatabaseTasks
+    end
+  end
+end
+
+# Allow proxy adapter to run rake tasks, i.e. db:drop, db:create, db:schema:load db:migrate, etc...
+ActiveRecord::Tasks::DatabaseTasks.register_task(
+  /mysql2_proxy/,
+  "ActiveRecord::Tasks::Mysql2ProxyDatabaseTasks"
+)

data/lib/active_record/tasks/postgresql_proxy_database_tasks.rb

@@ -1,39 +1,13 @@
 # frozen_string_literal: true
 
+require "active_record_proxy_adapters/database_tasks"
+
 module ActiveRecord
   module Tasks
     # Defines the postgresql tasks for dropping, creating, loading schema and dumping schema.
     # Bypasses all the proxy logic to send all requests to primary.
     class PostgreSQLProxyDatabaseTasks < PostgreSQLDatabaseTasks
-      def create(...)
-        sticking_to_primary { super }
-      end
-
-      def drop(...)
-        sticking_to_primary { super }
-      end
-
-      def structure_dump(...)
-        sticking_to_primary { super }
-      end
-
-      def structure_load(...)
-        sticking_to_primary { super }
-      end
-
-      def purge(...)
-        sticking_to_primary { super }
-      end
-
-      private
-
-      def sticking_to_primary(&)
-        ActiveRecord::Base.connected_to(role: context.writing_role, &)
-      end
-
-      def context
-        ActiveRecordProxyAdapters::ActiveRecordContext.new
-      end
+      include ActiveRecordProxyAdapters::DatabaseTasks
     end
   end
 end

data/lib/active_record_proxy_adapters/connection_handling.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "active_record/connection_adapters/postgresql_proxy_adapter"
+require "active_record/connection_adapters/mysql2_proxy_adapter"
 
 module ActiveRecordProxyAdapters
   # Module to extend ActiveRecord::Base with the connection handling methods.
@@ -31,5 +32,30 @@ module ActiveRecordProxyAdapters
         config
       )
     end
+
+    def mysql2_proxy_adapter_class
+      ::ActiveRecord::ConnectionAdapters::Mysql2ProxyAdapter
+    end
+
+    # This method is a copy and paste from Rails' mysql2_connection,
+    # replacing Mysql2Adapter by Mysql2ProxyAdapter
+    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
+    def mysql2_proxy_connection(config) # rubocop:disable Metrics/MethodLength
+      config = config.symbolize_keys
+      config[:flags] ||= 0
+
+      if config[:flags].is_a? Array
+        config[:flags].push "FOUND_ROWS"
+      else
+        config[:flags] |= Mysql2::Client::FOUND_ROWS
+      end
+
+      mysql2_proxy_adapter_class.new(
+        mysql2_proxy_adapter_class.new_client(config),
+        logger,
+        nil,
+        config
+      )
+    end
   end
 end

data/lib/active_record_proxy_adapters/database_tasks.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module ActiveRecordProxyAdapters
+  module DatabaseTasks # rubocop:disable Style/Documentation
+    extend ActiveSupport::Concern
+
+    included do
+      def create(...)
+        sticking_to_primary { super }
+      end
+
+      def drop(...)
+        sticking_to_primary { super }
+      end
+
+      def structure_dump(...)
+        sticking_to_primary { super }
+      end
+
+      def structure_load(...)
+        sticking_to_primary { super }
+      end
+
+      def purge(...)
+        sticking_to_primary { super }
+      end
+
+      private
+
+      def sticking_to_primary(&)
+        ActiveRecord::Base.connected_to(role: context.writing_role, &)
+      end
+
+      def context
+        ActiveRecordProxyAdapters::ActiveRecordContext.new
+      end
+    end
+  end
+end

data/lib/active_record_proxy_adapters/hijackable.rb

@@ -2,14 +2,13 @@
 
 require "active_record/tasks/postgresql_proxy_database_tasks"
 require "active_record/connection_adapters/postgresql_adapter"
-require "active_record_proxy_adapters/primary_replica_proxy"
 
 module ActiveRecordProxyAdapters
   # Defines mixins to delegate specific methods from the proxy to the adapter.
   module Hijackable
     extend ActiveSupport::Concern
 
-    class_methods do
+    class_methods do # rubocop:disable Metrics/BlockLength
       # Renames the methods from the original Adapter using the proxy suffix (_unproxied)
       # and delegate the original method name to the proxy.
       # Example: delegate_to_proxy(:execute) creates a method `execute_unproxied`,
@@ -32,10 +31,40 @@ module ActiveRecordProxyAdapters
         delegate(*method_names, to: :proxy)
       end
 
+      # Defines which methods should be hijacked from the original adapter and use the proxy
+      # @param method_names [Array<Symbol>] the list of method names from the adapter
+      def hijack_method(*method_names) # rubocop:disable Metrics/MethodLength
+        @hijacked_methods ||= Set.new
+        @hijacked_methods += Set.new(method_names)
+
+        method_names.each do |method_name|
+          define_method(method_name) do |*args, **kwargs, &block|
+            proxy_bypass_method = "#{method_name}#{unproxied_method_suffix}"
+            sql_string          = coerce_query_to_string(args.first)
+
+            appropriate_connection(sql_string) do |conn|
+              method_to_call = conn == primary_connection ? proxy_bypass_method : method_name
+
+              conn.send(method_to_call, *args, **kwargs, &block)
+            end
+          end
+        end
+      end
+
+      def unproxied_method_suffix
+        "_unproxied"
+      end
+
       private
 
       def proxy_method_name_for(method_name)
-        :"#{method_name}#{ActiveRecordProxyAdapters::PrimaryReplicaProxy::UNPROXIED_METHOD_SUFFIX}"
+        :"#{method_name}#{unproxied_method_suffix}"
+      end
+    end
+
+    included do
+      def unproxied_method_suffix
+        self.class.unproxied_method_suffix
       end
     end
   end

data/lib/active_record_proxy_adapters/mysql2_proxy.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "active_record_proxy_adapters/primary_replica_proxy"
+
+module ActiveRecordProxyAdapters
+  # Proxy to the original Mysql2Adapter, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
+  class Mysql2Proxy < PrimaryReplicaProxy
+  end
+end

data/lib/active_record_proxy_adapters/postgresql_proxy.rb

@@ -7,8 +7,6 @@ module ActiveRecordProxyAdapters
   # Proxy to the original PostgreSQLAdapter, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
   class PostgreSQLProxy < PrimaryReplicaProxy
     # ActiveRecord::PostgreSQLAdapter methods that should be proxied.
-    hijack_method :execute, :exec_query
-
     hijack_method :exec_no_cache, :exec_cache unless ActiveRecordContext.active_record_v8_0_or_greater?
   end
 end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -5,11 +5,14 @@ require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
 require "concurrent-ruby"
 require "active_record_proxy_adapters/active_record_context"
+require "active_record_proxy_adapters/hijackable"
 
 module ActiveRecordProxyAdapters
   # This is the base class for all proxies. It defines the methods that should be proxied
   # and the logic to determine which database to use.
   class PrimaryReplicaProxy # rubocop:disable Metrics/ClassLength
+    include Hijackable
+
     # All queries that match these patterns should be sent to the primary database
     SQL_PRIMARY_MATCHERS = [
       /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
@@ -25,27 +28,9 @@ module ActiveRecordProxyAdapters
     # requests to the primary database so the replica has time to replicate
     WRITE_STATEMENT_MATCHERS = [/\ABEGIN/i, /\ACOMMIT/i, /INSERT\sINTO\s/i, /UPDATE\s/i, /DELETE\sFROM\s/i,
                                 /DROP\s/i].map(&:freeze).freeze
-    UNPROXIED_METHOD_SUFFIX  = "_unproxied"
-
-    # Defines which methods should be hijacked from the original adapter and use the proxy
-    # @param method_names [Array<Symbol>] the list of method names from the adapter
-    def self.hijack_method(*method_names) # rubocop:disable Metrics/MethodLength
-      @hijacked_methods ||= Set.new
-      @hijacked_methods += Set.new(method_names)
-
-      method_names.each do |method_name|
-        define_method(method_name) do |*args, **kwargs, &block|
-          proxy_bypass_method = "#{method_name}#{UNPROXIED_METHOD_SUFFIX}"
-          sql_string          = coerce_query_to_string(args.first)
-
-          appropriate_connection(sql_string) do |conn|
-            method_to_call = conn == primary_connection ? proxy_bypass_method : method_name
 
-            conn.send(method_to_call, *args, **kwargs, &block)
-          end
-        end
-      end
-    end
+    # Abstract adapter methods that should be proxied.
+    hijack_method :execute, :exec_query
 
     def self.hijacked_methods
       @hijacked_methods.to_a
@@ -62,7 +47,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 +105,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 +132,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.3.0"
 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.3.0
 platform: ruby
 authors:
 - Matt Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,17 +67,22 @@ files:
 - Dockerfile
 - LICENSE.txt
 - README.md
+- db/mysql_structure.sql
 - db/postgresql_structure.sql
 - docker-compose.yml
 - docker/postgres_replica/cmd.sh
+- lib/active_record/connection_adapters/mysql2_proxy_adapter.rb
 - lib/active_record/connection_adapters/postgresql_proxy_adapter.rb
+- lib/active_record/tasks/mysql2_proxy_database_tasks.rb
 - lib/active_record/tasks/postgresql_proxy_database_tasks.rb
 - lib/active_record_proxy_adapters.rb
 - lib/active_record_proxy_adapters/active_record_context.rb
 - lib/active_record_proxy_adapters/configuration.rb
 - lib/active_record_proxy_adapters/connection_handling.rb
+- lib/active_record_proxy_adapters/database_tasks.rb
 - lib/active_record_proxy_adapters/hijackable.rb
 - lib/active_record_proxy_adapters/log_subscriber.rb
+- lib/active_record_proxy_adapters/mysql2_proxy.rb
 - lib/active_record_proxy_adapters/postgresql_proxy.rb
 - lib/active_record_proxy_adapters/primary_replica_proxy.rb
 - lib/active_record_proxy_adapters/railtie.rb