active_record_shards 3.8.0 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ddf4f7e3054f0ae5d1d0a1fb9d50c43ff98411f
-  data.tar.gz: 22b7e496f726e396b8bece299b1b6e36d3e32e91
+  metadata.gz: 9a95ee1107402ac016dcd5dbe7caf84b77973c5e
+  data.tar.gz: 7871eaecc9cf5971d2b1a35f002a8c0c82b1951c
 SHA512:
-  metadata.gz: a3b9ec6899a75d390321297b48f9ce18e8198bcfb3919556b4935f9e803bf229551bda1bc98b69f5eb7d5cb5a050f5aeee773f3a5dbd7eefb14c2f3514feee4f
-  data.tar.gz: d63f9cd510b2c164a7fb1d2d69899560401fb9115d9425838bdeb0ee1ff224e492b3dfc2e15b7e4daf5cc11d19b3e48eca094c989359b7442e1a3db05134c036
+  metadata.gz: edb32557a10fce0738d2015bcf4e747f00ec1b49cc72a99c1cbbfbd3d4583a202e19087abb374e434bd87387e7e0ef5e584b046ca2888d0fc6774c63e026ac6c
+  data.tar.gz: bd8d79125096f2228cf4d862b3fac99b346c303b4f4304d70c7294906c239a5b85f2342d7721984413879541620c6927ee64c4320fbb8ee53649f2f09143c8e0

data/README.md

@@ -5,7 +5,7 @@
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
 switch between database connections. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
 
-ActiveRecord Shards has been used and tested on Rails 3.2, 4.0, 4.1, 4.2 and 5.0 and has in some form or another been used in production on a large Rails app for several years.
+ActiveRecord Shards has been used and tested on Rails 3.2, 4.2 and 5.0 and has in some form or another been used in production on a large Rails app for several years.
 
 ## Installation
 

data/lib/active_record_shards.rb

@@ -28,10 +28,8 @@ ActiveRecord::Associations::CollectionProxy.include(ActiveRecordShards::Associat
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
 when '3.2'
   require 'active_record_shards-3-2'
-when '4.0'
-  require 'active_record_shards-4-0'
-when '4.1', '4.2'
-  require 'active_record_shards-4-1'
+when '4.2'
+  require 'active_record_shards-4-2'
 when '5.0', '5.1'
   require 'active_record_shards-5-0'
 else

data/lib/active_record_shards/connection_specification.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 ActiveRecord::Base.class_eval do
   def self.establish_connection(spec = ENV["DATABASE_URL"])
-    if ActiveRecord::VERSION::STRING >= '4.1.0'
+    if ActiveRecord::VERSION::MAJOR >= 4
       spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call
       spec = spec.to_sym if spec.is_a?(String)
       resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations

data/lib/active_record_shards/connection_switcher-4-0.rb

@@ -30,19 +30,19 @@ module ActiveRecordShards
 
       # note that since we're subverting the standard establish_connection path, we have to handle the funky autoloading of the
       # connection adapter ourselves.
-      specification_cache[name] ||= begin
-        if ActiveRecord::VERSION::STRING >= '4.1.0'
+      if ActiveRecord::VERSION::MAJOR >= 4
+        specification_cache[name] ||= begin
           resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
           resolver.spec(spec)
-        else
-          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
-          resolver.spec
         end
-      end
 
-      if ActiveRecord::VERSION::MAJOR >= 4
         connection_handler.establish_connection(self, specification_cache[name])
       else
+        specification_cache[name] ||= begin
+          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
+          resolver.spec
+        end
+
         connection_handler.establish_connection(connection_pool_name, specification_cache[name])
       end
     end

data/lib/active_record_shards/connection_switcher-5-0.rb

@@ -20,15 +20,8 @@ module ActiveRecordShards
 
       pool = connection_handler.retrieve_connection_pool(spec_name)
       if pool.nil?
-        spec =
-          if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR.zero?
-            resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(configurations)
-            resolver.spec(spec_name.to_sym, spec_name)
-          else
-            # Resolver will be applied by Rails 5.1+
-            spec_name.to_sym
-          end
-
+        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(configurations)
+        spec = resolver.spec(spec_name.to_sym, spec_name)
         connection_handler.establish_connection(spec)
       end
     end

data/lib/active_record_shards/connection_switcher-5-1.rb

@@ -0,0 +1,25 @@
+module ActiveRecordShards
+  module ConnectionSwitcher
+    def connection_specification_name
+      name = current_shard_selection.resolve_connection_name(sharded: is_sharded?, configurations: configurations)
+
+      unless configurations[name] || name == "primary"
+        raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in database.yml"
+      end
+
+      name
+    end
+
+    private
+
+    def ensure_shard_connection
+      # See if we've connected before. If not, call `#establish_connection`
+      # so that ActiveRecord can resolve connection_specification_name to an
+      # ARS connection.
+      spec_name = connection_specification_name
+
+      pool = connection_handler.retrieve_connection_pool(spec_name)
+      connection_handler.establish_connection(spec_name.to_sym) if pool.nil?
+    end
+  end
+end

data/lib/active_record_shards/connection_switcher.rb

@@ -158,11 +158,21 @@ module ActiveRecordShards
       ActiveRecordShards.rails_env
     end
 
-    def with_default_shard
-      if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
-        on_first_shard { yield }
-      else
-        yield
+    if ActiveRecord::VERSION::MAJOR >= 4
+      def with_default_shard
+        if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::SchemaMigration.table_name
+          on_first_shard { yield }
+        else
+          yield
+        end
+      end
+    else
+      def with_default_shard
+        if is_sharded? && current_shard_id.nil? && table_name != ActiveRecord::Migrator.schema_migrations_table_name
+          on_first_shard { yield }
+        else
+          yield
+        end
       end
     end
 
@@ -188,10 +198,12 @@ module ActiveRecordShards
 end
 
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-when '3.2', '4.0', '4.1', '4.2'
+when '3.2', '4.2'
   require 'active_record_shards/connection_switcher-4-0'
-when '5.0', '5.1'
+when '5.0'
   require 'active_record_shards/connection_switcher-5-0'
+when '5.1'
+  require 'active_record_shards/connection_switcher-5-1'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -189,8 +189,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/active_record_shards-3-2.rb
-- lib/active_record_shards-4-0.rb
-- lib/active_record_shards-4-1.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
@@ -200,6 +199,7 @@ files:
 - lib/active_record_shards/connection_specification.rb
 - lib/active_record_shards/connection_switcher-4-0.rb
 - lib/active_record_shards/connection_switcher-5-0.rb
+- lib/active_record_shards/connection_switcher-5-1.rb
 - lib/active_record_shards/connection_switcher.rb
 - lib/active_record_shards/default_slave_patches.rb
 - lib/active_record_shards/migration.rb
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.

data/lib/active_record_shards-4-0.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-require 'active_record_shards/connection_pool'
-require 'active_record_shards/connection_handler'
-require 'active_record_shards/connection_specification'
-require 'active_record_shards/schema_dumper_extension'
-
-ActiveRecordShards::ConnectionSpecification = ActiveRecord::ConnectionAdapters::ConnectionSpecification
-methods_to_override = [:establish_connection, :remove_connection, :pool_for, :pool_from_any_process_for]
-ActiveRecordShards.override_connection_handler_methods(methods_to_override)
-
-ActiveRecord::Associations::Preloader::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
-
-ActiveRecord::SchemaDumper.prepend(ActiveRecordShards::SchemaDumperExtension)