active_record_shards 3.6.2 → 3.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22328837e48da3dbf1b805e69a7f65ad8ae431b
-  data.tar.gz: 5f64e2de4f4d9b2ec578a7086ca1b343199692af
+  metadata.gz: 0fe1a0e108ca214d83011674329c5b74e25bd258
+  data.tar.gz: 8b49b4c6af876d50bb682cd343e9ecbe764adb3f
 SHA512:
-  metadata.gz: 1208459ce41631737cc65189ffe6fe94bad6e7441442cb61330647308a3422c8475fbf2d84a63549493c23eda176b6a70476a7a5dffc7f68f25608e0d2b3061e
-  data.tar.gz: 40f8b499653ef50efe49fb465c69b021f29069997df42a037788893673c03eb22d1651d1e17df281f1abba83a82b1bb9fa49bc9ada607138c5fa11243dc1dcc0
+  metadata.gz: b05dd1f52e2ce8ebe90ad20f6720f673d8678f41adada752a194fa2fc64d6add00da6f44b7c20e03693ba1f05904fe8580be0f449269512ead30cd8090b8097b
+  data.tar.gz: c651051f455d93e4bf9b60af647749875e18a82ec5d873cf23056592baa846240caca4a838bf5c505989c37be4e5f81651c2003ba9395a6836e54fae529a9ca5

data/lib/active_record_shards/connection_switcher.rb

@@ -70,7 +70,7 @@ module ActiveRecordShards
       else
         MasterSlaveProxy.new(self, which)
       end
-   end
+    end
 
     # Executes queries using the slave database. Fails over to master if no slave is found.
     # if you want to execute a block of code on the slave you can go:
@@ -238,7 +238,6 @@ module ActiveRecordShards
 
     def autoload_adapter(adapter_name)
       begin
-        require 'rubygems'
         gem "activerecord-#{adapter_name}-adapter"
         require "active_record/connection_adapters/#{adapter_name}_adapter"
       rescue LoadError
@@ -249,7 +248,6 @@ module ActiveRecordShards
         end
       end
 
-      adapter_method = "#{adapter_name}_connection"
       if !ActiveRecord::Base.respond_to?(adapter_name + "_connection")
         raise AdapterNotFound, "database configuration specifies nonexistent #{adapter_name} adapter"
       end

data/lib/active_record_shards/default_slave_patches.rb

@@ -43,10 +43,10 @@ module ActiveRecordShards
 
         class << self
           def columns_with_default_slave(*args, &block)
-            if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
-              read_columns_from = :slave
+            read_columns_from = if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
+              :slave
             else
-              read_columns_form = :master
+              :master
             end
 
             on_cx_switch_block(read_columns_from, :construct_ro_scope => false) { columns_without_default_slave(*args, &block) }
@@ -89,9 +89,9 @@ module ActiveRecordShards
 
     module ActiveRelationPatches
       def self.included(base)
-        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :calculate)
-        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :exists?)
-        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :pluck)
+        [:calculate, :exists?, :pluck, :find_with_associations].each do |m|
+          ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, m)
+        end
       end
 
       def on_slave_unless_tx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,7 +170,6 @@ 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/schema_cache_extension.rb
 - lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
 - lib/active_record_shards/shard_support.rb
@@ -195,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.

data/lib/active_record_shards/schema_cache_extension.rb

@@ -1,34 +0,0 @@
-unless (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR > 2) || ActiveRecord::VERSION::MAJOR > 4
-  ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
-    attr_accessor :schema_cache
-
-    private
-
-    alias :original_new_connection :new_connection
-
-    def new_connection
-      original_new_connection.tap do |connection|
-        if schema_cache
-          connection.schema_cache = schema_cache.dup
-        end
-      end
-    end
-  end
-
-  ActiveRecord::ConnectionAdapters::SchemaCache.class_eval do
-    def initialize_dup(other)
-      super
-
-      @columns      = @columns.dup
-      @columns_hash = @columns_hash.dup
-      @primary_keys = @primary_keys.dup
-      @tables       = @tables.dup
-    end
-  end
-end
-
-unless ActiveRecord::VERSION::MAJOR > 4
-  ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-    attr_writer :schema_cache
-  end
-end