standby 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b43e6971bad583281f150be7a768115af32883b72bdd42c16ee9b885c33b070
-  data.tar.gz: a6574d223d15071d3143dadcf3977edb82227c5b5455a55129e5887c4c097e16
+  metadata.gz: ed313fd2c207aef137a574816b7574d6614d5c2446f2d733aa7d08d2a40b6382
+  data.tar.gz: cda7f21a3cf9aa71c84da0cf8e985e965bd78fde3a21b5e57a8902a0e4b581a4
 SHA512:
-  metadata.gz: 5298e4882873365eb18a25a92e393547c9587d40e5acd70cdd25c87503d1d77ba713dab54ec826c4a675958c2aa2beb6dd31dd61da105c679712d884f981f9b9
-  data.tar.gz: 13cd75e347a2abbaa974e1f761422d6f2ad33d0cacd01c462a9e8d9e61f66febb47f87b6edcef89aefe3ec57c82b80291f79d83c50bb7c49b1139917d565e41c
+  metadata.gz: 3e9d7d67ea19465e263e36a7c6318e9f4de15b6c9f53dd1a0e51e6782b1118c2c0e3352b213c687b44ffc2da5d87cc5aa9a270b7e3cea2b3f64b86be4d9d74e5
+  data.tar.gz: 4d07f9692a78f4777814282ee120d9ac6df6ad0e723555758f1bb29062082158460728579c2666e3def498a8eaead6b29b4bc344beab76c9d50f6f41a62c5856

data/.github/workflows/ci.yml

@@ -10,6 +10,7 @@ jobs:
           - "2.7"
         rails_version:
           - "7.0"
+          - "6.1"
           - "5.2"
     runs-on: ubuntu-latest
     env:

data/Rakefile

@@ -1,4 +1,4 @@
-# require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
 Bundler::GemHelper.install_tasks(name: 'standby')
 
 # RSpec

data/gemfiles/rails6.1.gemfile

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1'
+gem 'sqlite3', '~> 1.4'
+
+# Rails 6.1 compat with Ruby 3.4+ (these were removed from default gems)
+gem 'logger'
+gem 'mutex_m'
+gem 'bigdecimal'
+gem 'base64'
+gem 'drb'
+
+gemspec name: 'standby', path: '../'

data/lib/standby/active_record/base.rb

@@ -1,8 +1,18 @@
 module ActiveRecord
   class Base
     class << self
+      alias_method :connection_pool_without_standby, :connection_pool
       alias_method :connection_without_standby, :connection
 
+      def connection_pool
+        case Thread.current[:_standby]
+        when :primary, NilClass
+          connection_pool_without_standby
+        else
+          Standby.connection_holder(Thread.current[:_standby]).connection_pool_without_standby
+        end
+      end
+
       def connection
         case Thread.current[:_standby]
         when :primary, NilClass

data/lib/standby/connection_holder.rb

@@ -6,7 +6,8 @@ module Standby
       # for delayed activation
       def activate(target)
         env_name = "#{ActiveRecord::ConnectionHandling::RAILS_ENV.call}_#{target}"
-        if Standby.version_gte?('7.0')
+        # Rails 6.1+ exposes DatabaseConfigurations helpers; older versions still use hash access.
+        if ActiveRecord::Base.configurations.respond_to?(:find_db_config)
           spec = ActiveRecord::Base.configurations.find_db_config(env_name)&.configuration_hash
         else
           spec = ActiveRecord::Base.configurations[env_name]
@@ -21,14 +22,16 @@ module Standby
   class << self
     def connection_holder(target)
       klass_name = "Standby#{target.to_s.camelize}ConnectionHolder"
-      standby_connections[klass_name] ||= begin
-        klass = Class.new(Standby::ConnectionHolder) do
-          self.abstract_class = true
+      standby_connections[klass_name] || standby_connections_mutex.synchronize do
+        standby_connections[klass_name] ||= begin
+          klass = Class.new(Standby::ConnectionHolder) do
+            self.abstract_class = true
+          end
+          Object.const_set(klass_name, klass)
+          klass.activate(target)
+          klass
         end
-        Object.const_set(klass_name, klass)
-        klass.activate(target)
-        klass
       end
     end
   end
-end
+end

data/lib/standby/version.rb

@@ -1,5 +1,5 @@
 module Standby
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 
   class << self
     def version_gte?(version)

data/lib/standby.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'active_record'
 require 'standby/version'
 require 'standby/base'
@@ -10,11 +11,18 @@ require 'standby/active_record/relation'
 require 'standby/active_record/log_subscriber'
 
 module Standby
+  @standby_connections = {}
+  @standby_connections_mutex = Mutex.new
+
   class << self
     attr_accessor :disabled
 
     def standby_connections
-      @standby_connections ||= {}
+      @standby_connections
+    end
+
+    def standby_connections_mutex
+      @standby_connections_mutex
     end
 
     def on_standby(name = :null_state, &block)

data/spec/configuration_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe 'configuration' do
   before do
     # Backup connection and configs
-    @backup_conn = Standby.instance_variable_get :@standby_connections
-    if Standby.version_gte?('7.0')
+    @backup_conn = (Standby.instance_variable_get(:@standby_connections) || {}).dup
+    # Rails 6.1+ wraps configurations in ActiveRecord::DatabaseConfigurations.
+    if ActiveRecord::Base.configurations.respond_to?(:configs_for)
       @backup_config = ActiveRecord::Base.configurations.configs_for.map do |config|
         [config.env_name, config.configuration_hash]
       end.to_h
@@ -26,7 +27,8 @@ describe 'configuration' do
   end
 
   it 'raises error if standby configuration not specified' do
-    if Standby.version_gte?('7.0')
+    # Rails 6.1+ no longer supports mutating configurations via hash-style access.
+    if ActiveRecord::Base.configurations.respond_to?(:configs_for)
       ActiveRecord::Base.configurations = @backup_config.merge({ 'test_standby' => {} })
     else
       ActiveRecord::Base.configurations['test_standby'] = nil
@@ -36,7 +38,8 @@ describe 'configuration' do
   end
 
   it 'connects to primary if standby configuration is disabled' do
-    if Standby.version_gte?('7.0')
+    # Rails 6.1+ no longer supports mutating configurations via hash-style access.
+    if ActiveRecord::Base.configurations.respond_to?(:configs_for)
       ActiveRecord::Base.configurations = @backup_config.merge({ 'test_standby' => {} })
     else
       ActiveRecord::Base.configurations['test_standby'] = nil
@@ -45,4 +48,35 @@ describe 'configuration' do
 
     expect(Standby.on_standby { User.count }).to be 2
   end
+
+  it 'initializes a standby connection holder once under contention' do
+    entered_activate = Queue.new
+    release_activate = Queue.new
+    call_count = 0
+
+    allow(Standby::ConnectionHolder).to receive(:activate).and_wrap_original do |original, target|
+      call_count += 1
+      if call_count == 1
+        entered_activate << true
+        release_activate.pop
+      end
+
+      original.call(target)
+    end
+
+    t1 = Thread.new { Standby.connection_holder(:standby) }
+    entered_activate.pop
+
+    t2 = Thread.new { Standby.connection_holder(:standby) }
+
+    expect(t2.join(0.1)).to be_nil
+    expect(call_count).to eq(1)
+
+    release_activate << true
+
+    [t1, t2].each(&:join)
+
+    expect(Standby.connection_holder(:standby).name).to eq('StandbyStandbyConnectionHolder')
+    expect(call_count).to eq(1)
+  end
 end

data/spec/spec_helper.rb

@@ -52,7 +52,11 @@ class Seeder
   end
 
   def connect(env)
+    ActiveRecord::Base.connection_pool.disconnect! if ActiveRecord::Base.connected?
     ActiveRecord::Base.establish_connection(env)
+    return unless ActiveRecord::Base.connection.adapter_name == 'SQLite'
+
+    ActiveRecord::Base.connection.execute('PRAGMA journal_mode=DELETE')
   end
 end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: standby
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Kenn Ejima
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -89,6 +88,7 @@ files:
 - bin/console
 - gemfiles/rails4.2.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.1.gemfile
 - gemfiles/rails7.0.gemfile
 - lib/standby.rb
 - lib/standby/active_record/base.rb
@@ -108,7 +108,6 @@ files:
 homepage: https://github.com/kenn/standby
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Read from stand-by databases for ActiveRecord
 test_files: