active_record_shards 3.15.2 → 3.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc7e3f2c8928e0eaef1b01e03be3a0c5a12b6313ea5093f1abce4117ab7f6b65
-  data.tar.gz: 1e9f1249f57b5a40c02b99a57cf830dfcab5e6712122a366e50a30ba0d9f07ca
+  metadata.gz: e6173b1dc57889f56b60dc15ad031d64ea6494a4c11c9bfcf63ba68215012137
+  data.tar.gz: efe84a0c10df29ef923e959aaf6c187d81dbd1f953ac30eda66457c8a344e0fc
 SHA512:
-  metadata.gz: 9efe5b8585ca8defeadc67652f2893a572aa9f4e7c8e3bfacbc9121d701d8db42ca32254a72d04964ee1d000fee441ce6afead286bef00ef36224ba64da32e57
-  data.tar.gz: a5602bbb2ef644ef588c85a0019b602b7f60cd3fd28635ebbd210e53eff5d19ae325ded5eac862dcaae2d6fdf035c3bced70a9b87b018c0301ecf86b34a417ad
+  metadata.gz: 16dded6c3889b89e399f346fed1d9f779ce091a1abb7136e20c2e587c7fe6db6b58fcbdd8e6cce7969db2c1199a94420118964fa8715a65e0156b6a0dbf66e36
+  data.tar.gz: ade8122972a9bfb7cec49957101856ecaf685f4174cc2b7400ddcfb0131f0b16996d68e464752e2e45495abf56141478898e33a9c573a6e0b821fa0ea997000f

data/lib/active_record_shards/connection_switcher.rb

@@ -31,9 +31,9 @@ module ActiveRecordShards
       switch_connection(old_options)
     end
 
-    def on_first_shard
+    def on_first_shard(&block)
       shard_name = shard_names.first
-      on_shard(shard_name) { yield }
+      on_shard(shard_name, &block)
     end
 
     def shards
@@ -170,9 +170,9 @@ module ActiveRecordShards
       ActiveRecordShards.rails_env
     end
 
-    def with_default_shard
+    def with_default_shard(&block)
       if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::SchemaMigration.table_name
-        on_first_shard { yield }
+        on_first_shard(&block)
       else
         yield
       end

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module ActiveRecordShards
   module DefaultSlavePatches
-    def self.wrap_method_in_on_slave(class_method, base, method)
+    def self.wrap_method_in_on_slave(class_method, base, method, force_on_slave: false)
       base_methods =
         if class_method
           base.methods + base.private_methods
@@ -11,10 +11,12 @@ module ActiveRecordShards
 
       return unless base_methods.include?(method)
       _, method, punctuation = method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
+      # _ALWAYS_ on slave, or only for on `on_slave_by_default = true` models?
+      wrapper = force_on_slave ? 'force_on_slave' : 'on_slave_unless_tx'
       base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         #{class_method ? 'class << self' : ''}
           def #{method}_with_default_slave#{punctuation}(*args, &block)
-            on_slave_unless_tx do
+            #{wrapper} do
               #{method}_without_default_slave#{punctuation}(*args, &block)
             end
           end
@@ -25,18 +27,6 @@ module ActiveRecordShards
       RUBY
     end
 
-    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 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
-
     def transaction_with_slave_off(*args, &block)
       if on_slave_by_default?
         begin
@@ -58,21 +48,33 @@ module ActiveRecordShards
       end
     end
 
-    CLASS_SLAVE_METHODS = [:find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :exists?].freeze
+    CLASS_SLAVE_METHODS = [
+      :calculate,
+      :count_by_sql,
+      :exists?,
+      :find_by_sql,
+      :find_every,
+      :find_one,
+      :find_some
+    ].freeze
+
+    CLASS_FORCE_SLAVE_METHODS = [
+      :columns,
+      :replace_bind_variable,
+      :replace_bind_variables,
+      :sanitize_sql_array,
+      :sanitize_sql_hash_for_assignment,
+      :table_exists?
+    ].freeze
 
     def self.extended(base)
       CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
+      CLASS_FORCE_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m, force_on_slave: true) }
 
       base.class_eval do
         include InstanceMethods
 
         class << self
-          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
         end
@@ -83,14 +85,18 @@ module ActiveRecordShards
       end
     end
 
-    def on_slave_unless_tx
+    def on_slave_unless_tx(&block)
       if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
-        on_slave { yield }
+        on_slave(&block)
       else
         yield
       end
     end
 
+    def force_on_slave(&block)
+      on_cx_switch_block(:slave, construct_ro_scope: false, force: true, &block)
+    end
+
     module ActiveRelationPatches
       def self.included(base)
         [:calculate, :exists?, :pluck, :load].each do |m|
@@ -99,12 +105,14 @@ module ActiveRecordShards
 
         if ActiveRecord::VERSION::MAJOR == 4
           # `where` and `having` clauses call `create_binds`, which will use the master connection
-          ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :create_binds)
+          ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :create_binds, force_on_slave: true)
         end
+
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :to_sql, force_on_slave: true)
       end
 
-      def on_slave_unless_tx
-        @klass.on_slave_unless_tx { yield }
+      def on_slave_unless_tx(&block)
+        @klass.on_slave_unless_tx(&block)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.3
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord