active_record_shards 3.9.2 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81a720c8a58e8f5108776bb9521d96a0655b4716
-  data.tar.gz: 2766cade5b7e607dc1f7bc941ba006f30f85cdc1
+  metadata.gz: 4910854dd97e92f0aab3a997b23c4f830d98e66f
+  data.tar.gz: df78f89f7245ab25bd3ca40c06990ceb929b66f9
 SHA512:
-  metadata.gz: bb3cbaf2517378f2bacb72dc2c2b9712c41e17d34831db3dab1db29510e1ca7216730e6b7d56538610495a8efe018ebc9ab1693e72947c934a638391bc67b549
-  data.tar.gz: a56dc45cc5f35cd291e10055463c4c33e30d8c99c4bd21a23f493ccfa40c74f4a8e0cb2b06f511b9bda4678c3a82871a55808320b6c0a7d049bd5b624e68efe8
+  metadata.gz: b25b5bd49ed22d0ca64d951b4384533711c0ee6451bd881fd6756786f97b3747ed10392756b1161460a0dc54f44a68c06847cb62f7e1387f568402405227411e
+  data.tar.gz: e29b7d4237ed37008edc25450b75bc620c3f10f50855ce7403334098be94b91a127297969c9bd4d6415f3ba106d626d9252fe39fc9ce94452a4e774b9d6a3e5c

data/lib/active_record_shards.rb

@@ -27,11 +27,11 @@ ActiveRecord::Associations::CollectionProxy.include(ActiveRecordShards::Associat
 
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
 when '3.2'
-  require 'active_record_shards-3-2'
+  require 'active_record_shards/patches-3-2'
 when '4.2'
-  require 'active_record_shards-4-2'
+  require 'active_record_shards/patches-4-2'
 when '5.0', '5.1'
-  require 'active_record_shards-5-0'
+  require 'active_record_shards/patches-5-0'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"
 end

data/lib/active_record_shards/connection_handler.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 ActiveRecord::ConnectionAdapters::ConnectionHandler.class_eval do
+  remove_method :retrieve_connection_pool
   if ActiveRecord::VERSION::MAJOR >= 4
     def retrieve_connection_pool(klass)
       class_to_pool[klass.connection_pool_name] ||= pool_for(klass)

data/lib/active_record_shards/connection_specification.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-ActiveRecord::Base.class_eval do
-  def self.establish_connection(spec = ENV["DATABASE_URL"])
+class << ActiveRecord::Base
+  remove_method :establish_connection unless ActiveRecord::VERSION::MAJOR == 4
+  def establish_connection(spec = ENV["DATABASE_URL"])
     if ActiveRecord::VERSION::MAJOR >= 4
       spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call
       spec = spec.to_sym if spec.is_a?(String)

data/lib/active_record_shards/connection_switcher.rb

@@ -95,24 +95,25 @@ module ActiveRecordShards
     alias_method :with_slave_if, :on_slave_if
     alias_method :with_slave_unless, :on_slave_unless
 
-    def on_cx_switch_block(which, options = {}, &block)
+    def on_cx_switch_block(which, force: false, construct_ro_scope: nil, &block)
       @disallow_slave ||= 0
+      @disallow_slave += 1 if which == :master
+
+      switch_to_slave = force || @disallow_slave.zero?
       old_options = current_shard_selection.options
-      switch_to_slave = (which == :slave && @disallow_slave.zero?)
-      switch_connection(slave: switch_to_slave)
 
-      @disallow_slave += 1 if which == :master
+      switch_connection(slave: switch_to_slave)
 
       # we avoid_readonly_scope to prevent some stack overflow problems, like when
       # .columns calls .with_scope which calls .columns and onward, endlessly.
-      if self == ActiveRecord::Base || !switch_to_slave || options[:construct_ro_scope] == false
+      if self == ActiveRecord::Base || !switch_to_slave || construct_ro_scope == false
         yield
       else
         readonly.scoping(&block)
       end
     ensure
       @disallow_slave -= 1 if which == :master
-      switch_connection(old_options)
+      switch_connection(old_options) if old_options
     end
 
     def supports_sharding?

data/lib/active_record_shards/default_slave_patches.rb

@@ -25,27 +25,29 @@ module ActiveRecordShards
       RUBY
     end
 
-    def columns_with_default_slave(*args, &block)
-      read_columns_from =
-        if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
-          :slave
-        else
-          :master
-        end
-
-      on_cx_switch_block(read_columns_from, construct_ro_scope: false) { columns_without_default_slave(*args, &block) }
+    def columns_with_force_slave(*args, &block)
+      on_cx_switch_block(:slave, construct_ro_scope: false, force: true) do
+        columns_without_force_slave(*args, &block)
+      end
     end
 
-    def transaction_with_slave_off(*args, &block)
-      if on_slave_by_default?
-        old_val = Thread.current[:_active_record_shards_slave_off]
-        Thread.current[:_active_record_shards_slave_off] = true
+    def table_exists_with_force_slave?(*args, &block)
+      on_cx_switch_block(:slave, construct_ro_scope: false, force: true) do
+        table_exists_without_force_slave?(*args, &block)
       end
+    end
 
-      transaction_without_slave_off(*args, &block)
-    ensure
+    def transaction_with_slave_off(*args, &block)
       if on_slave_by_default?
-        Thread.current[:_active_record_shards_slave_off] = old_val
+        begin
+          old_val = Thread.current[:_active_record_shards_slave_off]
+          Thread.current[:_active_record_shards_slave_off] = true
+          transaction_without_slave_off(*args, &block)
+        ensure
+          Thread.current[:_active_record_shards_slave_off] = old_val
+        end
+      else
+        transaction_without_slave_off(*args, &block)
       end
     end
 
@@ -60,7 +62,7 @@ module ActiveRecordShards
       end
     end
 
-    CLASS_SLAVE_METHODS = [:find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :exists?, :table_exists?].freeze
+    CLASS_SLAVE_METHODS = [:find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :exists?].freeze
 
     def self.extended(base)
       CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
@@ -72,8 +74,11 @@ module ActiveRecordShards
         alias_method :reload, :reload_with_slave_off
 
         class << self
-          alias_method :columns_without_default_slave, :columns
-          alias_method :columns, :columns_with_default_slave
+          alias_method :columns_without_force_slave, :columns
+          alias_method :columns, :columns_with_force_slave
+
+          alias_method :table_exists_without_force_slave?, :table_exists?
+          alias_method :table_exists?, :table_exists_with_force_slave?
 
           alias_method :transaction_without_slave_off, :transaction
           alias_method :transaction, :transaction_with_slave_off

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.10.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -188,9 +188,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/active_record_shards-3-2.rb
-- lib/active_record_shards-4-2.rb
-- lib/active_record_shards-5-0.rb
 - lib/active_record_shards.rb
 - lib/active_record_shards/association_collection_connection_selection.rb
 - lib/active_record_shards/configuration_parser.rb
@@ -204,6 +201,9 @@ files:
 - lib/active_record_shards/default_slave_patches.rb
 - lib/active_record_shards/migration.rb
 - lib/active_record_shards/model.rb
+- lib/active_record_shards/patches-3-2.rb
+- lib/active_record_shards/patches-4-2.rb
+- lib/active_record_shards/patches-5-0.rb
 - lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
 - lib/active_record_shards/shard_support.rb