active_record_shards 3.22.0 → 4.0.0.beta1

data/lib/active_record_shards/sql_comments.rb

@@ -1,23 +1,16 @@
-# show which connection was picked to debug primary/replica slowness when both servers are the same
+# show which connection was picked to debug master/slave slowness when both servers are the same
 module ActiveRecordShards
   module SqlComments
     module Methods
       def execute(query, name = nil)
-        shard = ActiveRecord::Base.current_shard_selection.shard
-        shard_text = shard ? "shard #{shard}" : 'unsharded'
-        replica = ActiveRecord::Base.current_shard_selection.on_replica?
-        replica_text = replica ? 'replica' : 'primary'
-        query = "/* #{shard_text} #{replica_text} */ " + query
+        slave = ActiveRecord::Base.current_shard_selection.on_slave?
+        query += " /* #{slave ? 'slave' : 'master'} */"
         super(query, name)
       end
     end
 
     def self.enable
-      ActiveRecord::Base.on_replica do
-        ActiveRecord::Base.on_shard(nil) do
-          ActiveRecord::Base.connection.class.prepend(Methods)
-        end
-      end
+      ActiveRecord::Base.connection.class.prepend(Methods)
     end
   end
 end

data/lib/active_record_shards/tasks.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require 'active_record_shards'
 
 %w[db:drop db:create db:abort_if_pending_migrations db:reset db:test:purge].each do |name|
@@ -9,16 +8,15 @@ end
 namespace :db do
   desc 'Drops the database for the current RAILS_ENV including shards'
   task drop: :load_config do
-    ActiveRecord::Base.configurations.to_h.each do |key, conf|
-      next if !key.start_with?(ActiveRecordShards.app_env) || key.end_with?("_replica", "_slave")
-
+    ActiveRecord::Base.configurations.each do |key, conf|
+      next if !key.starts_with?(ActiveRecordShards.rails_env) || key.ends_with?("_slave")
       begin
         ActiveRecordShards::Tasks.root_connection(conf).drop_database(conf['database'])
       # rescue ActiveRecord::NoDatabaseError # TODO: exists in AR but never is raised here ...
       #   $stderr.puts "Database '#{conf['database']}' does not exist"
-      rescue StandardError => e
-        warn e, *e.backtrace
-        warn "Couldn't drop #{conf['database']}"
+      rescue StandardError => error
+        $stderr.puts error, *error.backtrace
+        $stderr.puts "Couldn't drop #{conf['database']}"
       end
     end
   end
@@ -30,45 +28,36 @@ namespace :db do
 
   desc "Create the database defined in config/database.yml for the current RAILS_ENV including shards"
   task create: :load_config do
-    ActiveRecord::Base.configurations.to_h.each do |key, conf|
-      next if !key.start_with?(ActiveRecordShards.app_env) || key.end_with?("_replica", "_slave")
-
+    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 4.2 or greater
-        # https://github.com/rails/rails/blob/4-2-stable/activerecord/lib/active_record/tasks/mysql_database_tasks.rb#L85-L96
+        # MysqlAdapter takes charset instead of encoding in Rails 4
+        # https://github.com/rails/rails/commit/78b30fed9336336694fb2cb5d2825f95800b541c
         symbolized_configuration = conf.symbolize_keys
         symbolized_configuration[:charset] = symbolized_configuration[:encoding]
 
         ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'], symbolized_configuration)
-      rescue ActiveRecord::StatementInvalid => e
-        if e.message.include?('database exists')
+      rescue ActiveRecord::StatementInvalid => ex
+        if ex.message.include?('database exists')
           puts "#{conf['database']} already exists"
         else
-          raise e
+          raise ex
         end
       end
     end
-    ActiveRecord::Base.establish_connection(ActiveRecordShards.app_env.to_sym)
+    ActiveRecord::Base.establish_connection(ActiveRecordShards.rails_env.to_sym)
   end
 
   desc "Raises an error if there are pending migrations"
   task abort_if_pending_migrations: :environment do
     if defined? ActiveRecord
       pending_migrations =
-        if ActiveRecord::VERSION::MAJOR >= 6
-          migrations = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration).migrations
-          ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration).pending_migrations
-        elsif ActiveRecord::VERSION::STRING >= "5.2.0"
-          migrations = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
-          ActiveRecord::Migrator.new(:up, migrations).pending_migrations
-        else
-          ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
-        end
+        ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
 
       if pending_migrations.any?
-        warn "You have #{pending_migrations.size} pending migrations:"
+        puts "You have #{pending_migrations.size} pending migrations:"
         pending_migrations.each do |pending_migration|
-          warn '  %4d %s' % [pending_migration.version, pending_migration.name]
+          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
         end
         abort %(Run "rake db:migrate" to update your database then try again.)
       end
@@ -92,20 +81,12 @@ end
 
 module ActiveRecordShards
   module Tasks
-    class << self
-      def root_connection(conf)
-        conf = conf.merge('database' => nil)
-        spec = spec_for(conf)
-
-        ActiveRecord::Base.send("#{conf['adapter']}_connection", spec.config)
-      end
-
-      private
-
-      def spec_for(conf)
-        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
-        resolver.spec(conf)
-      end
+    def self.root_connection(conf)
+      # this will trigger rails to load the adapter
+      conf = conf.merge('database' => nil)
+      resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
+      resolver.spec(conf)
+      ActiveRecord::Base.send("#{conf['adapter']}_connection", conf)
     end
   end
 end

data/lib/active_record_shards.rb

@@ -1,27 +1,19 @@
 # frozen_string_literal: true
-
 require 'active_record'
 require 'active_record/base'
 require 'active_record_shards/configuration_parser'
 require 'active_record_shards/model'
+require 'active_record_shards/sharded_model'
 require 'active_record_shards/shard_selection'
 require 'active_record_shards/connection_switcher'
 require 'active_record_shards/association_collection_connection_selection'
-require 'active_record_shards/migration'
-require 'active_record_shards/default_replica_patches'
-require 'active_record_shards/schema_dumper_extension'
+require 'active_record_shards/default_slave_patches'
 
 module ActiveRecordShards
-  class << self
-    attr_accessor :disable_replica_readonly_records
-  end
-
-  def self.app_env
+  def self.rails_env
     env = Rails.env if defined?(Rails.env)
     env ||= RAILS_ENV if Object.const_defined?(:RAILS_ENV)
     env ||= ENV['RAILS_ENV']
-    env ||= APP_ENV if Object.const_defined?(:APP_ENV)
-    env ||= ENV['APP_ENV']
     env || 'development'
   end
 end
@@ -29,119 +21,7 @@ end
 ActiveRecord::Base.extend(ActiveRecordShards::ConfigurationParser)
 ActiveRecord::Base.extend(ActiveRecordShards::Model)
 ActiveRecord::Base.extend(ActiveRecordShards::ConnectionSwitcher)
-ActiveRecord::Base.extend(ActiveRecordShards::DefaultReplicaPatches)
-ActiveRecord::Relation.include(ActiveRecordShards::DefaultReplicaPatches::ActiveRelationPatches)
+ActiveRecord::Base.extend(ActiveRecordShards::DefaultSlavePatches)
+ActiveRecord::Relation.include(ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
 ActiveRecord::Associations::CollectionProxy.include(ActiveRecordShards::AssociationCollectionConnectionSelection)
-ActiveRecord::Associations::Builder::HasAndBelongsToMany.include(ActiveRecordShards::DefaultReplicaPatches::Rails41HasAndBelongsToManyBuilderExtension)
-ActiveRecord::SchemaDumper.prepend(ActiveRecordShards::SchemaDumperExtension)
-
-case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-when '4.2'
-  require 'active_record_shards/patches-4-2'
-
-  # https://github.com/rails/rails/blob/v4.2.11.3/activerecord/lib/active_record/associations/association.rb#L97
-  ActiveRecord::Associations::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationAssociationScopePatch)
-
-  # https://github.com/rails/rails/blob/v4.2.11.3/activerecord/lib/active_record/associations/singular_association.rb#L44-L53
-  ActiveRecord::Associations::SingularAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationGetRecordsPatch)
-
-  # https://github.com/rails/rails/blob/v4.2.11.3/activerecord/lib/active_record/associations/collection_association.rb#L447-L456
-  ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationGetRecordsPatch)
-
-  # https://github.com/rails/rails/blob/v4.2.11.3/activerecord/lib/active_record/associations/preloader/association.rb#L89
-  ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsPreloaderAssociationAssociatedRecordsByOwnerPatch)
-when '5.0'
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/associations/association.rb#L97
-  ActiveRecord::Associations::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationAssociationScopePatch)
-
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/associations/singular_association.rb#L56-L65
-  ActiveRecord::Associations::SingularAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationGetRecordsPatch)
-
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/associations/collection_association.rb#L442-L451
-  ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationGetRecordsPatch)
-
-  # https://github.com/rails/rails/blob/v5.0.7/activerecord/lib/active_record/associations/preloader/association.rb#L120
-  ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsPreloaderAssociationLoadRecordsPatch)
-when '5.1'
-  # https://github.com/rails/rails/blob/v5.1.7/activerecord/lib/active_record/associations/association.rb#L97
-  ActiveRecord::Associations::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationAssociationScopePatch)
-
-  # https://github.com/rails/rails/blob/v5.1.7/activerecord/lib/active_record/associations/singular_association.rb#L41
-  ActiveRecord::Associations::SingularAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationFindTargetPatch)
-
-  # https://github.com/rails/rails/blob/v5.1.7/activerecord/lib/active_record/associations/collection_association.rb#L305
-  ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationFindTargetPatch)
-
-  # https://github.com/rails/rails/blob/v5.1.7/activerecord/lib/active_record/associations/preloader/association.rb#L120
-  ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsPreloaderAssociationLoadRecordsPatch)
-when '5.2'
-  # https://github.com/rails/rails/blob/v5.2.6/activerecord/lib/active_record/relation.rb#L530
-  # But the #exec_queries method also calls #connection, and I don't know if we should patch that one, too...
-  ActiveRecord::Relation.prepend(ActiveRecordShards::DefaultReplicaPatches::Rails52RelationPatches)
-
-  # https://github.com/rails/rails/blob/v5.2.6/activerecord/lib/active_record/associations/singular_association.rb#L42
-  ActiveRecord::Associations::SingularAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationFindTargetPatch)
-
-  # https://github.com/rails/rails/blob/v5.2.6/activerecord/lib/active_record/associations/collection_association.rb#L308
-  ActiveRecord::Associations::CollectionAssociation.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationFindTargetPatch)
-
-  # https://github.com/rails/rails/blob/v5.2.6/activerecord/lib/active_record/associations/preloader/association.rb#L96
-  ActiveRecord::Associations::Preloader::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsPreloaderAssociationLoadRecordsPatch)
-when '6.0'
-  # https://github.com/rails/rails/blob/v6.0.4/activerecord/lib/active_record/type_caster/connection.rb#L28
-  ActiveRecord::TypeCaster::Connection.prepend(ActiveRecordShards::DefaultReplicaPatches::TypeCasterConnectionConnectionPatch)
-
-  # https://github.com/rails/rails/blob/v6.0.4/activerecord/lib/active_record/schema.rb#L53-L54
-  ActiveRecord::Schema.prepend(ActiveRecordShards::DefaultReplicaPatches::SchemaDefinePatch)
-
-  # https://github.com/rails/rails/blob/v6.0.4/activerecord/lib/active_record/relation.rb#L739
-  # But the #exec_queries and #compute_cache_version methods also call #connection, and I don't know if we should patch those, too...
-  ActiveRecord::Relation.prepend(ActiveRecordShards::DefaultReplicaPatches::Rails52RelationPatches)
-
-  # https://github.com/rails/rails/blob/v6.0.4/activerecord/lib/active_record/associations/association.rb#L213
-  ActiveRecord::Associations::Association.prepend(ActiveRecordShards::DefaultReplicaPatches::AssociationsAssociationFindTargetPatch)
-else
-  raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"
-end
-
-require 'active_record_shards/deprecation'
-
-ActiveRecordShards::Deprecation.deprecate_methods(
-  ActiveRecordShards::AssociationCollectionConnectionSelection,
-  on_slave_if: :on_replica_if,
-  on_slave_unless: :on_replica_unless,
-  on_slave: :on_replica,
-  on_master: :on_primary,
-  on_master_if: :on_primary_if,
-  on_master_unless: :on_primary_unless
-)
-
-ActiveRecordShards::Deprecation.deprecate_methods(
-  ActiveRecordShards::ConnectionSwitcher,
-  on_slave_if: :on_replica_if,
-  on_slave_unless: :on_replica_unless,
-  on_master_or_slave: :on_primary_or_replica,
-  on_slave: :on_replica,
-  on_master: :on_primary,
-  on_master_if: :on_primary_if,
-  on_master_unless: :on_primary_unless,
-  on_slave?: :on_replica?
-)
-
-ActiveRecordShards::Deprecation.deprecate_methods(
-  ActiveRecordShards::DefaultReplicaPatches,
-  transaction_with_slave_off: :transaction_with_replica_off,
-  on_slave_unless_tx: :on_replica_unless_tx
-)
-
-ActiveRecordShards::Deprecation.deprecate_methods(
-  ActiveRecordShards::Model,
-  on_slave_by_default?: :on_replica_by_default?,
-  :on_slave_by_default= => :on_replica_by_default=
-)
-
-ActiveRecordShards::Deprecation.deprecate_methods(
-  ActiveRecordShards::ShardSelection,
-  on_slave?: :on_replica?,
-  :on_slave= => :on_replica=
-)
+ActiveRecord::Associations::Builder::HasAndBelongsToMany.include(ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyBuilderExtension)

metadata

@@ -1,62 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.22.0
+  version: 4.0.0.beta1
 platform: ruby
 authors:
-- Benjamin Quorning
-- Gabe Martin-Dempesy
-- Pierre Schambacher
 - Mick Staugaard
 - Eric Chapweske
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,35 +55,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.0
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.0
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,67 +97,80 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-minitest
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: phenix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
-description: Easily run queries on shard and replica databases.
+        version: 0.2.0
+description: Easily run queries on shard and slave databases.
 email:
-- bquorning@zendesk.com
-- gabe@zendesk.com
-- pschambacher@zendesk.com
 - mick@staugaard.com
+- eac@zendesk.com
+- ben@gimbo.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -181,23 +179,14 @@ files:
 - lib/active_record_shards.rb
 - lib/active_record_shards/association_collection_connection_selection.rb
 - lib/active_record_shards/configuration_parser.rb
-- lib/active_record_shards/connection_handler.rb
-- lib/active_record_shards/connection_pool.rb
-- lib/active_record_shards/connection_specification.rb
-- lib/active_record_shards/connection_switcher-4-2.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-6-0.rb
 - lib/active_record_shards/connection_switcher.rb
-- lib/active_record_shards/default_replica_patches.rb
 - lib/active_record_shards/default_slave_patches.rb
-- lib/active_record_shards/deprecation.rb
-- lib/active_record_shards/migration.rb
 - lib/active_record_shards/model.rb
-- lib/active_record_shards/patches-4-2.rb
-- lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
 - lib/active_record_shards/shard_support.rb
+- lib/active_record_shards/sharded_model.rb
 - lib/active_record_shards/sql_comments.rb
 - lib/active_record_shards/tasks.rb
 homepage: https://github.com/zendesk/active_record_shards
@@ -210,16 +199,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3.1
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.

data/lib/active_record_shards/connection_handler.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-ActiveRecord::ConnectionAdapters::ConnectionHandler.class_eval do
-  remove_method :retrieve_connection_pool
-  def retrieve_connection_pool(klass)
-    class_to_pool[klass.connection_pool_name] ||= pool_for(klass)
-  end
-end

data/lib/active_record_shards/connection_pool.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordShards
-  ConnectionPoolNameDecorator = Struct.new(:name)
-
-  # It overrides given connection handler methods (they differ depend on
-  # Rails version).
-  #
-  # It takes the first argument, ActiveRecord::Base object or
-  # String (connection_pool_name), converts it in Struct object and
-  # passes to the original method.
-  #
-  # Example:
-  #   methods_to_override = [:establish_connection, :remove_connection]
-  #   ActiveRecordShards.override_connection_handler_methods(methods_to_override)
-  #
-  def self.override_connection_handler_methods(method_names)
-    method_names.each do |method_name|
-      ActiveRecord::ConnectionAdapters::ConnectionHandler.class_eval do
-        define_method("#{method_name}_with_connection_pool_name") do |*args|
-          unless args[0].is_a? ConnectionPoolNameDecorator
-            name = if args[0].is_a? String
-                     args[0]
-                   else
-                     args[0].connection_pool_name
-                   end
-            args[0] = ConnectionPoolNameDecorator.new(name)
-          end
-          send("#{method_name}_without_connection_pool_name", *args)
-        end
-        alias_method :"#{method_name}_without_connection_pool_name", method_name
-        alias_method method_name, :"#{method_name}_with_connection_pool_name"
-      end
-    end
-  end
-end

data/lib/active_record_shards/connection_specification.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class << ActiveRecord::Base
-  remove_method :establish_connection if ActiveRecord::VERSION::MAJOR >= 5
-  def establish_connection(spec = ENV["DATABASE_URL"])
-    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"
-    end
-
-    remove_connection
-    specification_cache[connection_pool_name] = spec
-    connection_handler.establish_connection self, spec
-  end
-end