active_record_proxy_adapters 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b272f6fe240bd15128438342d9fad9d81d94c9c6b5a41b188639eae55801b58d
-  data.tar.gz: 37a8b6a65f7ace36976a6bb2c0c868f2a85401b0ee3a3cfbde32f7a17eafbf4a
+  metadata.gz: bca625e0a728907c505db941a4398b5aa144dcdd5f6866ac9a3969f0b783c4d0
+  data.tar.gz: 3ab824330a83e8309b31763b24fe7c74ba0efff2a1eff28505d2a8216442f557
 SHA512:
-  metadata.gz: 157760e5eee20e9c92a4a269e26ad4b8afa41d2f5557a6fcfcdd04bc3323709a5c7d8cde8a4e0165ff1cb7f5c71c0d758a5c804ef67c67bed0dbcbf8424bb403
-  data.tar.gz: 909e6ddc7b82eb18b7a98f5481a24ff127126b49a69664f39b33d285157821eb769b908a41bab68a61334dc634aac5e8d78b8a7198f7fe7268e9be79b5dfcfac
+  metadata.gz: 1bc0567abfff9e1877abe107074a7e3f35f574ecefc2584f188809a0940c37a9192c88f3ae71f0e682d7115de75cd8b82ef827874e75195dc635572a8a8c7173
+  data.tar.gz: 6ee734e3da7c41d458403e10589d3edd8126862ddcfa2d63034d75c884ec98e383c58e0877166c25155c44ef3a2c13e307378df850b47b0da77d103ff31d57c2

data/lib/active_record/connection_adapters/trilogy_proxy_adapter.rb

@@ -15,7 +15,7 @@ module ActiveRecord
 
       ADAPTER_NAME = "TrilogyProxy"
 
-      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
+      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods, :exec_insert)
 
       def initialize(...)
         @proxy = ActiveRecordProxyAdapters::TrilogyProxy.new(self)

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -18,11 +18,11 @@ module ActiveRecordProxyAdapters
     end
 
     def hijackable_methods
-      %i[exec_delete exec_insert exec_query exec_update execute select]
+      %i[execute exec_query internal_exec_query]
     end
 
     def active_record_v7?
-      active_record_version >= Gem::Version.new("7.1") && active_record_version < Gem::Version.new("8.0")
+      active_record_version >= Gem::Version.new("7.2") && active_record_version < Gem::Version.new("8.0")
     end
 
     def active_record_v7_2_or_greater?

data/lib/active_record_proxy_adapters/connection_handling/mysql2_proxy.rb

@@ -6,40 +6,3 @@ rescue LoadError
   # mysql2 not available
   return
 end
-
-module ActiveRecordProxyAdapters
-  module Mysql2
-    # 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
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.extend(ActiveRecordProxyAdapters::Mysql2::ConnectionHandling)
-end

data/lib/active_record_proxy_adapters/connection_handling/postgresql_proxy.rb

@@ -6,41 +6,3 @@ 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 PostgreSQL
-    module ConnectionHandling # rubocop:disable Style/Documentation
-      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
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.extend(ActiveRecordProxyAdapters::PostgreSQL::ConnectionHandling)
-end

data/lib/active_record_proxy_adapters/connection_handling/sqlite3_proxy.rb

@@ -6,23 +6,3 @@ rescue LoadError
   # sqlite3 not available
   return
 end
-
-module ActiveRecordProxyAdapters
-  module SQLite3
-    # Module to extend ActiveRecord::Base with the connection handling methods.
-    # Required to make adapter work in ActiveRecord versions <= 7.2.x
-    module ConnectionHandling
-      def sqlite3_proxy_adapter_class
-        ActiveRecord::ConnectionAdapters::SQLite3ProxyAdapter
-      end
-
-      def sqlite3_proxy_connection(config)
-        sqlite3_proxy_adapter_class.new(config)
-      end
-    end
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.extend(ActiveRecordProxyAdapters::SQLite3::ConnectionHandling)
-end

data/lib/active_record_proxy_adapters/connection_handling/trilogy_proxy.rb

@@ -6,39 +6,3 @@ rescue LoadError
   # trilogy not available
   return
 end
-
-module ActiveRecordProxyAdapters
-  module Trilogy
-    # Module to extend ActiveRecord::Base with the connection handling methods.
-    # Required to make adapter work in ActiveRecord versions <= 7.2.x
-    module ConnectionHandling
-      def trilogy_proxy_adapter_class
-        ActiveRecord::ConnectionAdapters::TrilogyProxyAdapter
-      end
-
-      def trilogy_proxy_connection(config) # rubocop:disable Metrics/MethodLength
-        configuration = config.dup
-
-        # Set FOUND_ROWS capability on the connection so UPDATE queries returns number of rows
-        # matched rather than number of rows updated.
-        configuration[:found_rows] = true
-
-        options = [
-          configuration[:host],
-          configuration[:port],
-          configuration[:database],
-          configuration[:username],
-          configuration[:password],
-          configuration[:socket],
-          0
-        ]
-
-        trilogy_proxy_adapter_class.new nil, logger, options, configuration
-      end
-    end
-  end
-end
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Base.extend(ActiveRecordProxyAdapters::Trilogy::ConnectionHandling)
-end

data/lib/active_record_proxy_adapters/middleware.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rack"
-require "rack/events"
 require "json"
 require "active_record_proxy_adapters/context"
 require "active_record_proxy_adapters/contextualizer"
@@ -44,16 +43,6 @@ module ActiveRecordProxyAdapters
       Rack::Utils.set_cookie_header!(headers, COOKIE_NAME, cookie)
     end.freeze
 
-    class EventHandler # rubocop:disable Style/Documentation
-      include Rack::Events::Abstract
-      include Mixin::Configuration
-      include Contextualizer
-
-      def on_finish(_request, _response)
-        self.current_context = context_store.new({})
-      end
-    end
-
     def initialize(app, cookie_options = {})
       @app = app
       @cookie_options = cookie_options

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -7,7 +7,6 @@ require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/mixin/configuration"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/blank"
-require "timeout"
 
 module ActiveRecordProxyAdapters
   # This is the base class for all proxies. It defines the methods that should be proxied
@@ -223,9 +222,8 @@ module ActiveRecordProxyAdapters
 
     def match_sql?(sql_string)
       proc do |matcher|
-        # TODO: switch to regexp timeout once Ruby 3.1 support is dropped.
-        Timeout.timeout(proxy_checkout_timeout.to_f) { matcher.match?(sql_string) }
-      rescue Timeout::Error
+        Regexp.new(matcher.source, Regexp::IGNORECASE, timeout: proxy_checkout_timeout.to_f).match?(sql_string)
+      rescue Regexp::TimeoutError
         regexp_timeout_strategy.call(sql_string, matcher)
 
         false

data/lib/active_record_proxy_adapters/railtie.rb

@@ -2,17 +2,21 @@
 
 require "active_support"
 require "active_record_proxy_adapters/core"
-require "active_record_proxy_adapters/railties/mysql2"
 require "active_record_proxy_adapters/railties/postgresql"
-require "active_record_proxy_adapters/railties/rack_middleware"
-require "active_record_proxy_adapters/railties/sqlite3"
+require "active_record_proxy_adapters/railties/mysql2"
 require "active_record_proxy_adapters/railties/trilogy"
+require "active_record_proxy_adapters/railties/sqlite3"
 
 module ActiveRecordProxyAdapters
   # Hooks into rails boot process to extend ActiveRecord with the proxy adapter.
   class Railtie < Rails::Railtie
+    require "active_record_proxy_adapters/middleware"
     require "active_record_proxy_adapters/rake"
 
+    initializer "active_record_proxy_adapters.configure_rails_initialization" do |app|
+      app.middleware.use ActiveRecordProxyAdapters::Middleware
+    end
+
     rake_tasks do
       ActiveRecordProxyAdapters::Rake.load_tasks
       ActiveRecordProxyAdapters::Rake.enhance_db_tasks

data/lib/active_record_proxy_adapters/trilogy_proxy.rb

@@ -5,5 +5,6 @@ require "active_record_proxy_adapters/mysql2_proxy"
 module ActiveRecordProxyAdapters
   # Proxy to the Mysql2Proxy, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
   class TrilogyProxy < Mysql2Proxy
+    hijack_method :exec_insert
   end
 end

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Matt Cruz
@@ -15,40 +15,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: digest
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: timeout
-  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'
 description: |-
   This gem allows automatic connection switching between a primary and one read replica database in ActiveRecord.
   It pattern matches the SQL statement being sent to decide whether it should go to the replica (SELECT) or the
@@ -152,7 +138,6 @@ files:
 - lib/active_record_proxy_adapters/railtie.rb
 - lib/active_record_proxy_adapters/railties/mysql2.rb
 - lib/active_record_proxy_adapters/railties/postgresql.rb
-- lib/active_record_proxy_adapters/railties/rack_middleware.rb
 - lib/active_record_proxy_adapters/railties/sqlite3.rb
 - lib/active_record_proxy_adapters/railties/trilogy.rb
 - lib/active_record_proxy_adapters/rake.rb

data/lib/active_record_proxy_adapters/railties/rack_middleware.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "active_support"
-require "active_record_proxy_adapters/middleware"
-
-module ActiveRecordProxyAdapters
-  # Hooks into rails boot process to add the rack middleware for stickiness cookies.
-  class RackMiddleware < Rails::Railtie
-    initializer "active_record_proxy_adapters.add_middleware_to_rack_stack" do |app|
-      app.middleware.use ActiveRecordProxyAdapters::Middleware
-      app.middleware.use Rack::Events, [ActiveRecordProxyAdapters::Middleware::EventHandler.new]
-    end
-  end
-end