active_record_proxy_adapters 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6a98229ff0dd2f30d7737792821deeda8b445e2eac66f1c025e82465aa6f34
-  data.tar.gz: f368b3f0d102a55646f3a95238eaa8fd4366dfaebd060906085a11fd52c285ec
+  metadata.gz: e9709c38149a112c5203c15ed59fe97903484dcc7842c82e070c57d29fea21ed
+  data.tar.gz: f9054fc5ce575e3d0877a4aa3b3ba9cd59da532c4b30d85536e4f63318119aee
 SHA512:
-  metadata.gz: '084a6b96bf5c17af4eda2137527443a92acbab1eed930046cd2920fb827bcf0ec253eb3d5c038879830e66f4beb8daab51225d068759423413ab0dfd386ed606'
-  data.tar.gz: 5ba78c23e63f0d6281465402025dccbf17d09deae578c496704d33b6389dbc6e12d7f2bff849c40593349ca260e43efb44d2a9605935da1b8dd541bea05d5311
+  metadata.gz: 7fe2bf87693040205f3e1aa62cc48b783d830b618d65423a4a8c3bae1dc029aae526d00227f5ca7ed4542dba04832641a86b2344ab6036956d3b2d9d1fc90b6b
+  data.tar.gz: 26c32105d9ed2c6f6d49016224284077207f780d0d3e56e62a59e81441808b1c00109f52c0baf867b09dba1a33a7aab2e12e4bc54b59789ddf288f0802e615cd

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -17,9 +17,24 @@ module ActiveRecordProxyAdapters
       connection.connection_class || ActiveRecord::Base
     end
 
+    # rubocop:disable Style/TrailingCommaInArrayLiteral
     def hijackable_methods
-      %i[exec_delete exec_insert exec_query exec_update execute select]
+      [
+        # Create
+        :insert,
+        :exec_insert_all, # this one is an exception to the rule. there's no higher-level equivalent method to be called
+        # Retrieve
+        :select,
+        # Update
+        :update,
+        # Delete
+        :delete,
+        # Generic
+        :exec_query,
+        :execute,
+      ]
     end
+    # rubocop:enable Style/TrailingCommaInArrayLiteral
 
     def active_record_v7?
       active_record_version >= Gem::Version.new("7.2") && active_record_version < Gem::Version.new("8.0")

data/lib/active_record_proxy_adapters/middleware.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rack"
+require "rack/events"
 require "json"
 require "active_record_proxy_adapters/context"
 require "active_record_proxy_adapters/contextualizer"
@@ -43,6 +44,16 @@ 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

@@ -102,7 +102,8 @@ module ActiveRecordProxyAdapters
     end
 
     def coerce_query_to_string(sql_or_arel)
-      sql_or_arel.respond_to?(:to_sql) ? sql_or_arel.to_sql : sql_or_arel.to_s
+      # TODO: implement custom Proxy arel parser
+      sql_or_arel.respond_to?(:to_sql) ? sql_or_arel.to_sql(connection_class) : sql_or_arel.to_s
     end
 
     def appropriate_connection(sql_string, &block)
@@ -173,7 +174,14 @@ module ActiveRecordProxyAdapters
 
       result
     ensure
-      replica_connection?(connection) && replica_pool.checkin(connection)
+      # Check the connection back into its own pool, not whatever pool currently
+      # answers to the :reading role. In Rails system tests,
+      # ActiveRecord::TestFixtures#setup_shared_connection_pool reassigns the
+      # :reading role's pool_config on every transactional-fixture test's
+      # before_setup, so re-resolving `replica_pool` here can return a pool
+      # different from the one the connection was checked out of — which would
+      # check a replica adapter into the primary pool and poison it.
+      connection.pool.checkin(connection) if replica_connection?(connection)
     end
 
     def connected_to(role:, &block)

data/lib/active_record_proxy_adapters/railtie.rb

@@ -2,21 +2,17 @@
 
 require "active_support"
 require "active_record_proxy_adapters/core"
-require "active_record_proxy_adapters/railties/postgresql"
 require "active_record_proxy_adapters/railties/mysql2"
-require "active_record_proxy_adapters/railties/trilogy"
+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/trilogy"
 
 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/railties/rack_middleware.rb

@@ -0,0 +1,14 @@
+# 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

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Matt Cruz
@@ -138,6 +138,7 @@ 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