active_record_proxy_adapters 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efb046fb2816644ce048912c4c2666ae00f90fd728800f867cbe79bab99a59f3
-  data.tar.gz: 3d193415b9063dcfb5633c8e1493c20742f8cfbf06bc0baa7efccb291c727b49
+  metadata.gz: 151caa80f35f53ad02ef3307a55ef0fec4f1a6f369e6afac8d063e4ea2ad5e7f
+  data.tar.gz: 60213ad52a363c435514038eeb65227bff7132b91a6dbed86b8917459449c39e
 SHA512:
-  metadata.gz: 8faf6efe63b55a9f00bbd4664f862abd3f0dd729f22b4e59306515a5dcd0fefbd42077cfaafc39f33f75d23eedd11a861e9284ba38c15868c69f72956d3acbbb
-  data.tar.gz: 91717a29aca4d6c41c71436527adb72cac844a4d19a2707eb5111d4f5f8b42b3c017990bdcc77972b48a7fa32082b02f74328a4c86b4f87cebc776b1d1641a17
+  metadata.gz: 7720b6fe6b2d6848d30444f77c71d2567996f2e45011c79e6c4791e043b7d9333c2d92554cdf5f6b5a48c29c6b384509a00b9f9b3b930402d47c98188744daa7
+  data.tar.gz: b73be535ad798afb4386d4027e4e92df00d9864a196d4cc1d30ad3a0a4e524c87ad12f67d214ef524a1641800ccf5bc2ab4911acf49c5606d867f51981a18fec

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 ## [Unreleased]
 
-- Handle PendingMigrationConnection introduced by Rails 7.2 and backported to Rails 7.1
-- Stick to same connection throughout request span
+- Fix Active Record adapters dependency loading
+
+## [0.3.0] - 2025-01-17
+
+- Add Mysql2ProxyAdapter https://github.com/Nasdaq/active_record_proxy_adapters/commit/7481b79dc93114f9b3b40faa8f3eecce90fe9104
+
+## [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
 

data/Dockerfile

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

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 Nasdaq
+Copyright (c) 2024 Nasdaq, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -33,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:
@@ -48,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
@@ -90,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
@@ -239,6 +264,7 @@ end
 
 # app/models/portal.rb
 class Portal < ApplicationRecord
+  validates :name, uniqueness: true
 end
 
 # in rails console -e test
@@ -246,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
@@ -297,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/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/mysql2.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+begin
+  require "active_record/connection_adapters/mysql2_proxy_adapter"
+rescue LoadError
+  # mysql2 not available
+  return
+end
+
+module ActiveRecordProxyAdapters
+  # Module to extend ActiveRecord::Base with the connection handling methods.
+  # Required to make adapter work in ActiveRecord versions <= 7.2.x
+  module ConnectionHandling
+    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/connection_handling/postgresql.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+begin
+  require "active_record/connection_adapters/postgresql_proxy_adapter"
+rescue LoadError
+  # Postgres not available
+  return
+end
+
+module ActiveRecordProxyAdapters
+  # Module to extend ActiveRecord::Base with the connection handling methods.
+  # Required to make adapter work in ActiveRecord versions <= 7.2.x
+  module ConnectionHandling
+    def postgresql_proxy_adapter_class
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLProxyAdapter
+    end
+
+    # This method is a copy and paste from Rails' postgresql_connection,
+    # replacing PostgreSQLAdapter by PostgreSQLProxyAdapter
+    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
+    def postgresql_proxy_connection(config) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      conn_params = config.symbolize_keys.compact
+
+      # Map ActiveRecords param names to PGs.
+      conn_params[:user]   = conn_params.delete(:username) if conn_params[:username]
+      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
+
+      # Forward only valid config params to PG::Connection.connect.
+      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+      conn_params.slice!(*valid_conn_param_keys)
+
+      postgresql_proxy_adapter_class.new(
+        postgresql_proxy_adapter_class.new_client(conn_params),
+        logger,
+        conn_params,
+        config
+      )
+    end
+  end
+end

data/lib/active_record_proxy_adapters/connection_handling.rb

@@ -1,35 +1,11 @@
 # frozen_string_literal: true
 
-require "active_record/connection_adapters/postgresql_proxy_adapter"
+require "active_record_proxy_adapters/connection_handling/postgresql"
+require "active_record_proxy_adapters/connection_handling/mysql2"
 
 module ActiveRecordProxyAdapters
   # Module to extend ActiveRecord::Base with the connection handling methods.
   # Required to make adapter work in ActiveRecord versions <= 7.2.x
   module ConnectionHandling
-    def postgresql_proxy_adapter_class
-      ::ActiveRecord::ConnectionAdapters::PostgreSQLProxyAdapter
-    end
-
-    # This method is a copy and paste from Rails' postgresql_connection,
-    # replacing PostgreSQLAdapter by PostgreSQLProxyAdapter
-    # This is required by ActiveRecord versions <= 7.2.x to establish a connection using the adapter.
-    def postgresql_proxy_connection(config) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      conn_params = config.symbolize_keys.compact
-
-      # Map ActiveRecords param names to PGs.
-      conn_params[:user]   = conn_params.delete(:username) if conn_params[:username]
-      conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
-
-      # Forward only valid config params to PG::Connection.connect.
-      valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
-      conn_params.slice!(*valid_conn_param_keys)
-
-      postgresql_proxy_adapter_class.new(
-        postgresql_proxy_adapter_class.new_client(conn_params),
-        logger,
-        conn_params,
-        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

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Cruz
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -67,17 +66,24 @@ 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/connection_handling/mysql2.rb
+- lib/active_record_proxy_adapters/connection_handling/postgresql.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
@@ -94,7 +100,6 @@ metadata:
   source_code_uri: https://github.com/Nasdaq/active_record_proxy_adapters
   changelog_uri: https://github.com/Nasdaq/active_record_proxy_adapters/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Read replica proxy adapters for ActiveRecord!
 test_files: []