active_record_shards 3.9.1 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eaf3339acdbdbfd5a5e69de209999bcdee61f0a
-  data.tar.gz: 0c08479308dd97ec3b96d319582a7ba967142727
+  metadata.gz: 81a720c8a58e8f5108776bb9521d96a0655b4716
+  data.tar.gz: 2766cade5b7e607dc1f7bc941ba006f30f85cdc1
 SHA512:
-  metadata.gz: 258f24f35992d4bc243c0e7076346c4da3777be04de94feb7bb86b1d07956d0e2329474d7b912aaca8bfe2fd58f99aac551fb26a8419cb13c97f807548f194c5
-  data.tar.gz: 422849bea3e139723574b745eb1dae664d19e5d8e4eb48bda314f0841c39aa86497cd52113f4fc7049a918429d122962cfd3ec5bad044792446c90caaa4c8732
+  metadata.gz: bb3cbaf2517378f2bacb72dc2c2b9712c41e17d34831db3dab1db29510e1ca7216730e6b7d56538610495a8efe018ebc9ab1693e72947c934a638391bc67b549
+  data.tar.gz: a56dc45cc5f35cd291e10055463c4c33e30d8c99c4bd21a23f493ccfa40c74f4a8e0cb2b06f511b9bda4678c3a82871a55808320b6c0a7d049bd5b624e68efe8

data/lib/active_record_shards/default_slave_patches.rb

@@ -98,13 +98,6 @@ module ActiveRecordShards
         [:calculate, :exists?, :pluck, :find_with_associations].each do |m|
           ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, m)
         end
-
-        # ActiveRecord::Explain in v3 will eagerly establish an on_master
-        # connection just to just the _static_ `supports_explain?` method on
-        # the Mysql2Adapter
-        if ActiveRecord::VERSION::MAJOR == 3
-          ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :logging_query_plan)
-        end
       end
 
       def on_slave_unless_tx

data/lib/active_record_shards/model.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
+
 module ActiveRecordShards
   module Model
     def not_sharded
       if self != ActiveRecord::Base && self != base_class
         raise "You should only call not_sharded on direct descendants of ActiveRecord::Base"
       end
-      @sharded = false
+      self.sharded = false
     end
 
     def is_sharded? # rubocop:disable Style/PredicateName
-      sharded_ivar = defined?(@sharded) ? @sharded : nil
       if self == ActiveRecord::Base
-        sharded_ivar != false && supports_sharding?
+        sharded != false && supports_sharding?
       elsif self == base_class
-        if sharded_ivar.nil?
+        if sharded.nil?
           ActiveRecord::Base.is_sharded?
         else
-          sharded_ivar != false
+          sharded != false
         end
       else
         base_class.is_sharded?
@@ -58,5 +58,6 @@ module ActiveRecordShards
     private
 
     attr_reader :on_slave_by_default
+    attr_accessor :sharded
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.48.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.