active_record_shards 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cefdc4fc943b46f49fe54cefae07891f3164d85ecd22a1122d505d89985c8f5
-  data.tar.gz: 12947cbb8fefa3b1913ee6e9eba6b2fd12512aae76cdc4eeedd869454bf1add1
+  metadata.gz: 894803fd2a019a4e502a051edfe37f9d98e91573488220e634c2cce40eaeea3a
+  data.tar.gz: 5c0ef8cd58a09d72997f967980660e02752945ae02a1bc471cdc62d0a2c03055
 SHA512:
-  metadata.gz: ff79d82557e8404dc27d14d4a119d8a0303ef4b79af88ae137cd9b18bef454620ee0c38fcde50989307ef08c98bc5a8bac27bc57d946483ad2f7db0ca6a5d757
-  data.tar.gz: 8776bee0e6ed8e67b0aa846138e0492def1edc09090e14d672b2e890671c58c4740bbbb7c67dd61f4f5aef6bf3b54325338ee309bb9fc80e2e442f76980e0ff0
+  metadata.gz: 68a350aebd431856ccaf50578a7733ade59a70feef0cc65916dd4140923ec50c807c07cadb753acbd44f1af7a41aba99b87d97a5d3926c729617e039a5a79a16
+  data.tar.gz: 0d08e0aa6eccce4763729e1685965d2367db2244eb1d72a0a9b175f0d3483cb2975f548791568eb61fa5d75f51a76b6c3df8e967d34f246b5e54f57b7d3d9c28

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.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 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](#installation)
 - [Configuration](#configuration)

data/lib/active_record_shards.rb

@@ -8,6 +8,7 @@ require 'active_record_shards/connection_switcher'
 require 'active_record_shards/association_collection_connection_selection'
 require 'active_record_shards/migration'
 require 'active_record_shards/default_slave_patches'
+require 'active_record_shards/schema_dumper_extension'
 
 module ActiveRecordShards
   def self.rails_env
@@ -24,14 +25,14 @@ ActiveRecord::Base.extend(ActiveRecordShards::ConnectionSwitcher)
 ActiveRecord::Base.extend(ActiveRecordShards::DefaultSlavePatches)
 ActiveRecord::Relation.include(ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
 ActiveRecord::Associations::CollectionProxy.include(ActiveRecordShards::AssociationCollectionConnectionSelection)
+ActiveRecord::Associations::Builder::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
+ActiveRecord::SchemaDumper.prepend(ActiveRecordShards::SchemaDumperExtension)
 
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-when '3.2'
-  require 'active_record_shards/patches-3-2'
 when '4.2'
   require 'active_record_shards/patches-4-2'
 when '5.0', '5.1', '5.2'
-  require 'active_record_shards/patches-5-0'
+  :ok
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"
 end

data/lib/active_record_shards/connection_handler.rb

@@ -1,13 +1,7 @@
 # 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)
-    end
-  else
-    def retrieve_connection_pool(klass)
-      (@class_to_pool || @connection_pools)[klass.connection_pool_name]
-    end
+  def retrieve_connection_pool(klass)
+    class_to_pool[klass.connection_pool_name] ||= pool_for(klass)
   end
 end

data/lib/active_record_shards/connection_specification.rb

@@ -1,16 +1,11 @@
 # frozen_string_literal: true
 class << ActiveRecord::Base
-  remove_method :establish_connection unless ActiveRecord::VERSION::MAJOR == 4
+  remove_method :establish_connection if ActiveRecord::VERSION::MAJOR >= 5
   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)
-      resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
-      spec = resolver.spec(spec)
-    else
-      resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new spec, configurations
-      spec = resolver.spec
-    end
+    spec ||= ActiveRecord::ConnectionHandling::DEFAULT_ENV.call
+    spec = spec.to_sym if spec.is_a?(String)
+    resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
+    spec = resolver.spec(spec)
 
     unless respond_to?(spec.adapter_method)
       raise AdapterNotFound, "database configuration specifies nonexistent #{spec.config[:adapter]} adapter"
@@ -18,11 +13,6 @@ class << ActiveRecord::Base
 
     remove_connection
     specification_cache[connection_pool_name] = spec
-
-    if ActiveRecord::VERSION::MAJOR >= 4
-      connection_handler.establish_connection self, spec
-    else
-      connection_handler.establish_connection connection_pool_name, spec
-    end
+    connection_handler.establish_connection self, spec
   end
 end

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

@@ -25,23 +25,12 @@ module ActiveRecordShards
         raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in your database config. (configurations: #{configurations.keys.inspect})"
       end
 
-      # in 3.2 rails is asking for a connection pool in a map of these ConnectionSpecifications.  If we want to re-use connections,
-      # we need to re-use specs.
-      if ActiveRecord::VERSION::MAJOR >= 4
-        specification_cache[name] ||= begin
-          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
-          resolver.spec(spec)
-        end
-
-        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])
+      specification_cache[name] ||= begin
+        resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations
+        resolver.spec(spec)
       end
+
+      connection_handler.establish_connection(self, specification_cache[name])
     end
 
     def specification_cache
@@ -58,11 +47,7 @@ module ActiveRecordShards
     end
 
     def connected_to_shard?
-      if ActiveRecord::VERSION::MAJOR >= 4
-        specs_to_pools = Hash[connection_handler.connection_pool_list.map { |pool| [pool.spec, pool] }]
-      else
-        specs_to_pools = connection_handler.connection_pools
-      end
+      specs_to_pools = Hash[connection_handler.connection_pool_list.map { |pool| [pool.spec, pool] }]
 
       specs_to_pools.key?(connection_pool_key)
     end

data/lib/active_record_shards/connection_switcher.rb

@@ -170,21 +170,11 @@ module ActiveRecordShards
       ActiveRecordShards.rails_env
     end
 
-    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
+    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
 
@@ -216,7 +206,7 @@ module ActiveRecordShards
 end
 
 case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-when '3.2', '4.2'
+when '4.2'
   require 'active_record_shards/connection_switcher-4-0'
 when '5.0'
   require 'active_record_shards/connection_switcher-5-0'

data/lib/active_record_shards/default_slave_patches.rb

@@ -93,10 +93,7 @@ module ActiveRecordShards
 
     module ActiveRelationPatches
       def self.included(base)
-        [
-          :calculate, :exists?, :pluck,
-          ActiveRecord::VERSION::MAJOR >= 4 ? :load : :find_with_associations
-        ].each do |m|
+        [:calculate, :exists?, :pluck, :load].each do |m|
           ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, m)
         end
       end
@@ -106,20 +103,6 @@ module ActiveRecordShards
       end
     end
 
-    module HasAndBelongsToManyPreloaderPatches
-      def self.included(base)
-        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil # rubocop:disable Style/RescueModifier
-      end
-
-      def on_slave_unless_tx
-        klass.on_slave_unless_tx { yield }
-      end
-
-      def exists_with_default_slave?(*args, &block)
-        on_slave_unless_tx { exists_without_default_slave?(*args, &block) }
-      end
-    end
-
     # in rails 4.1+, they create a join class that's used to pull in records for HABTM.
     # this simplifies the hell out of our existence, because all we have to do is inerit on-slave-by-default
     # down from the parent now.

data/lib/active_record_shards/migration.rb

@@ -15,11 +15,7 @@ module ActiveRecord
       # Rails creates the internal tables on the unsharded DB. We make them
       # manually on the sharded DBs.
       ActiveRecord::Base.on_all_shards do
-        if ActiveRecord::VERSION::MAJOR >= 4
-          ActiveRecord::SchemaMigration.create_table
-        else
-          ActiveRecord::Base.connection.initialize_schema_migrations_table
-        end
+        ActiveRecord::SchemaMigration.create_table
         if ActiveRecord::VERSION::MAJOR >= 5
           ActiveRecord::InternalMetadata.create_table
         end

data/lib/active_record_shards/patches-4-2.rb

@@ -2,12 +2,7 @@
 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::Builder::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
-
-ActiveRecord::SchemaDumper.prepend(ActiveRecordShards::SchemaDumperExtension)

data/lib/active_record_shards/tasks.rb

@@ -31,8 +31,8 @@ namespace :db do
     ActiveRecord::Base.configurations.each do |key, conf|
       next if !key.starts_with?(ActiveRecordShards.rails_env) || key.ends_with?("_slave")
       begin
-        # MysqlAdapter takes charset instead of encoding in Rails 3.2 or greater
-        # https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/railties/databases.rake#L68-L82
+        # MysqlAdapter takes charset instead of encoding in Rails 4.2 or greater
+        # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/tasks/mysql_database_tasks.rb#L85-L96
         symbolized_configuration = conf.symbolize_keys
         symbolized_configuration[:charset] = symbolized_configuration[:encoding]
 
@@ -55,10 +55,8 @@ namespace :db do
         if ActiveRecord::VERSION::STRING >= "5.2.0"
           migrations = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
           ActiveRecord::Migrator.new(:up, migrations).pending_migrations
-        elsif ActiveRecord::VERSION::MAJOR >= 4
-          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
         else
-          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
+          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
         end
 
       if pending_migrations.any?
@@ -99,13 +97,8 @@ module ActiveRecordShards
       private
 
       def spec_for(conf)
-        if ActiveRecord::VERSION::MAJOR >= 4
-          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
-          resolver.spec(conf)
-        else
-          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new conf, ActiveRecord::Base.configurations
-          resolver.spec
-        end
+        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
+        resolver.spec(conf)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -41,7 +41,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -191,9 +191,7 @@ 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

data/lib/active_record_shards/patches-3-2.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-require 'active_record_shards/connection_pool'
-require 'active_record_shards/connection_handler'
-require 'active_record_shards/connection_specification'
-
-
-ActiveRecordShards::ConnectionSpecification = ActiveRecord::Base::ConnectionSpecification
-methods_to_override = [:remove_connection]
-ActiveRecordShards.override_connection_handler_methods(methods_to_override)
-
-ActiveRecord::Associations::Preloader::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-
-
-require 'active_record_shards/schema_dumper_extension'
-
-
-
-
-
-ActiveRecord::Associations::Builder::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::Rails41HasAndBelongsToManyBuilderExtension)
-
-ActiveRecord::SchemaDumper.prepend(ActiveRecordShards::SchemaDumperExtension)