rails-sharding 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbf5cc3247b1d2a9046f4029dc1bd4c5e54e3c5
-  data.tar.gz: f53f4bdcb282c4302173c1373925dbea133e734e
+  metadata.gz: 9f4f44b9e47e25d00cce1cd88897d85750be2465
+  data.tar.gz: c84a17b9c9a59fd471e627c0784450cba5930451
 SHA512:
-  metadata.gz: 4b2d608de33eb59b96de0ceef6336892276cb5a302c9be6f4566dd005e90da39fa54e87e9042af7402ebdaaaa6aa2b3c03f6ded5f17e4035c22eecf4bf0dd454
-  data.tar.gz: a9c137e16bc54ebd5660cb8fab6ad8398bec2f1b4edbf6c9af10232515f4b5e90079e4b48bc56edabc0f6ce84d7596efe8c8525031596292f9d4ef7e592f2623
+  metadata.gz: 113d4ba656d6ff072c81a116141cc4b7057d914fa64f9ccf00f64e4a0a08b062e4fde0b388216143ef5c5ba378c564b90fb2615b7d765683901d9d335b7ca28a
+  data.tar.gz: edda93d0db35871a3dd1b2cc0a95838112dfa928da60e925ae98f7d4467e298112907a6d3b800fc7267a9d0d41d8ee5a3d68d5433f629748e6dbad1b7dacf049

data/lib/rails/sharding/connection_handler.rb

@@ -26,13 +26,30 @@ module Rails::Sharding
 
       resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(shard_group_configurations)
       begin
+        connection_spec = resolver.spec(shard_name.to_sym)
+
+        # since Rails 5.1 connection_spec already comes with :name set to whatever
+        # key you used to retrieve it from the resolver, in this case the shard_name.
+        # We don't want that, so we overwrite it with our connection name formed
+        # by shard_group:shard_name
         connection_name = connection_name(shard_group, shard_name)
-        connection_spec = resolver.spec(shard_name.to_sym, connection_name)
+        connection_spec.instance_variable_set(:@name, connection_name)
       rescue ActiveRecord::AdapterNotSpecified
-        raise Errors::ConfigNotFoundError, "Cannot find configuration for shard '#{shard_group}:#{shard_name}' in environment '#{environment}' in #{Config.shards_config_file}"
+        raise Errors::ConfigNotFoundError, "Cannot find configuration for shard '#{shard_group}:#{shard_name}' in environment '#{environment}' in #{Config.shards_config_file}, or it does not specify :adapter"
       end
 
-      connection_handler.establish_connection(connection_spec)
+      # Since Rails 5.1 we cannot use connection_handler.establish_connection anymore,
+      # because it does more than establishing_connection. It does a second
+      # connection specification lookup on Base.configurations (where our spec
+      # is not, because we define it in a shards.yml instead of the regular
+      # database.yml) and it notifies subscribers of a event that does not concern
+      # us. Because of this we directly create the connection_pool and inject to
+      # the handler.
+      # Note: we should consider writting our connection handler from scratch, since
+      # it has become simpler than reusing the one from rails. And it will not break
+      # as long as the ConnectionPool interface is stable.
+      connection_handler.remove_connection(connection_spec.name)
+      connection_handler.send(:owner_to_pool)[connection_spec.name] = ActiveRecord::ConnectionAdapters::ConnectionPool.new(connection_spec)
     end
 
     def self.connection_pool(shard_group, shard_name)
@@ -111,7 +128,7 @@ module Rails::Sharding
       class << connection
         def log(sql, name="SQL", binds=[], type_casted_binds=[], statement_name=nil, &block)
           name = (name.to_s + " (#{shard_tag})").strip
-          self.original_log(sql, name, binds, type_casted_binds, statement_name, &block)
+          original_log(sql, name, binds, type_casted_binds, statement_name, &block)
         end
       end
 

data/lib/rails/sharding/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sharding
-    VERSION = "1.0.5"
+    VERSION = "1.1.0"
   end
 end

data/rails-sharding.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rails', '~> 5.0.0'
+  spec.add_runtime_dependency 'rails', '~> 5.1.0'
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-sharding
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Henrique Gubert
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement