active_record_shards 3.11.2 → 3.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc0fcaa322a29df41febb37f52fd52dfb4e9259
-  data.tar.gz: 460544575270a626b64fc671d95d706bfac532a6
+  metadata.gz: '09b0da024cd5b13020b14dde7e822530b7f82fcc'
+  data.tar.gz: 0c2d9149aa653176d122c97fe632e6d47e00716a
 SHA512:
-  metadata.gz: 7d7cb9f8d135e1c230c2f467dbb761b844004c7e86d77cf5af267e6966654af8f5061d34852c76bdcc59af606a6c9688bb5ac70cfa2c928bdbec4c4ffd7f1345
-  data.tar.gz: 5e471616a88ccab4a18eb8c29a707911ad1246623729ea61c576d5964c73ddfd5f50a30847399d87012310b2457afb141c09411368c6dae27e8a19a610a4297e
+  metadata.gz: 59ec6f7c8e6c8639beee8aea8ded4c0b8aa910b839c4f0350836077bc745692330a0106df273b7b78e46251c0b3a4fb0a27e6164a17475669eac8afea0444d5c
+  data.tar.gz: dd24e476ad1c062427b54e5898f5a33393547acfeb1d1faf63024b4b900c2144672d2c67c2c42023225ef63b0e0c69c3722c188f320f6d50fc28e0773f356e21

data/lib/active_record_shards.rb

@@ -30,7 +30,7 @@ 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'
+when '5.0', '5.1', '5.2'
   require 'active_record_shards/patches-5-0'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"

data/lib/active_record_shards/association_collection_connection_selection.rb

@@ -32,8 +32,6 @@ module ActiveRecordShards
       end
 
       def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissing
-        # would love to not rely on version here, unfortunately @association_collection
-        # is a sensitive little bitch of an object.
         reflection = @association_collection.proxy_association.reflection
         reflection.klass.on_cx_switch_block(@which) { @association_collection.send(method, *args, &block) }
       end

data/lib/active_record_shards/configuration_parser.rb

@@ -10,6 +10,11 @@ module ActiveRecordShards
 
       conf.to_a.each do |env_name, env_config|
         next unless shards = env_config.delete('shards')
+
+        unless shards.keys.all? { |shard_name| shard_name.is_a?(Integer) }
+          raise "All shard names must be integers: #{shards.keys.inspect}."
+        end
+
         env_config['shard_names'] = shards.keys
         shards.each do |shard_name, shard_conf|
           expand_child!(env_config, shard_conf)

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

@@ -22,14 +22,11 @@ module ActiveRecordShards
       spec = configurations[name]
 
       if spec.nil?
-        raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in database.yml"
+        raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in your database config. (configurations: #{configurations.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.
-
-      # note that since we're subverting the standard establish_connection path, we have to handle the funky autoloading of the
-      # connection adapter ourselves.
       if ActiveRecord::VERSION::MAJOR >= 4
         specification_cache[name] ||= begin
           resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new configurations

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

@@ -4,7 +4,7 @@ module ActiveRecordShards
       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"
+        raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in your database config. (configurations: #{configurations.inspect})"
       end
 
       name

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

@@ -4,7 +4,7 @@ module ActiveRecordShards
       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"
+        raise ActiveRecord::AdapterNotSpecified, "No database defined by #{name} in your database config. (configurations: #{configurations.inspect})"
       end
 
       name

data/lib/active_record_shards/connection_switcher.rb

@@ -139,7 +139,10 @@ module ActiveRecordShards
 
     def shard_names
       unless config = configurations[shard_env]
-        raise "Did not find #{shard_env} in configurations, did you forget to add it to your database.yml ? (configurations: #{configurations.inspect})"
+        raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.inspect})"
+      end
+      unless config.fetch(SHARD_NAMES_CONFIG_KEY, []).all? { |shard_name| shard_name.is_a?(Integer) }
+        raise "All shard names must be integers: #{config[SHARD_NAMES_CONFIG_KEY].inspect}."
       end
       config[SHARD_NAMES_CONFIG_KEY] || []
     end
@@ -153,6 +156,9 @@ module ActiveRecordShards
         end
 
         if options.key?(:shard)
+          unless configurations[shard_env]
+            raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.inspect})"
+          end
           current_shard_selection.shard = options[:shard]
         end
 
@@ -214,7 +220,7 @@ when '3.2', '4.2'
   require 'active_record_shards/connection_switcher-4-0'
 when '5.0'
   require 'active_record_shards/connection_switcher-5-0'
-when '5.1'
+when '5.1', '5.2'
   require 'active_record_shards/connection_switcher-5-1'
 else
   raise "ActiveRecordShards is not compatible with #{ActiveRecord::VERSION::STRING}"

data/lib/active_record_shards/migration.rb

@@ -14,24 +14,6 @@ module ActiveRecord
         alias_method :"#{m}_without_sharding", m.to_sym
         alias_method m.to_sym, :"#{m}_with_sharding"
       end
-
-      def bootstrap_migrations_from_nil_shard(migrations_path, this_migration = nil)
-        migrations = nil
-        ActiveRecord::Base.on_shard(nil) do
-          migrations = ActiveRecord::Migrator.new(:up, migrations_path).migrated
-        end
-
-        puts "inserting #{migrations.size} migrations on all shards..."
-        ActiveRecord::Base.on_all_shards do
-          migrator = ActiveRecord::Migrator.new(:up, migrations_path)
-          migrations.each do |m|
-            migrator.__send__(:record_version_state_after_migrating, m)
-          end
-          if this_migration
-            migrator.__send__(:record_version_state_after_migrating, this_migration)
-          end
-        end
-      end
     end
 
     # don't allow Migrator class to cache versions
@@ -82,9 +64,6 @@ module ActiveRecordShards
     end
   end
 
-  # ok, so some 'splaining to do.  Rails 3.1 puts the migrate() method on the instance of the
-  # migration, where it should have been.  But this makes our monkey patch incompatible.
-  # So we're forced to *either* include or extend this.
   module ActualMigrationExtension
     def migrate_with_forced_shard(direction)
       if migration_shard.blank?

data/lib/active_record_shards/model.rb

@@ -9,7 +9,7 @@ module ActiveRecordShards
       self.sharded = false
     end
 
-    def is_sharded? # rubocop:disable Style/PredicateName
+    def is_sharded? # rubocop:disable Naming/PredicateName
       if self == ActiveRecord::Base
         sharded != false && supports_sharding?
       elsif self == base_class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.11.2
+  version: 3.11.3
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.