active_record_shards 2.6.7 → 2.7.0

data/lib/active_record_shards/connection_switcher.rb

@@ -167,10 +167,19 @@ module ActiveRecordShards
       # 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.
 
-      specification_cache[name] ||= ActiveRecord::Base::ConnectionSpecification.new(spec, "#{spec['adapter']}_connection")
-      cx_spec = specification_cache[name]
+      # 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 >= "3.2.0"
+          resolver = ActiveRecord::Base::ConnectionSpecification::Resolver.new spec, configurations
+          resolver.spec
+        else
+          autoload_adapter(spec['adapter'])
+          ActiveRecord::Base::ConnectionSpecification.new(spec, "#{spec['adapter']}_connection")
+        end
+      end
 
-      connection_handler.establish_connection(connection_pool_name, cx_spec)
+      connection_handler.establish_connection(connection_pool_name, specification_cache[name])
     end
 
     def specification_cache
@@ -207,6 +216,25 @@ module ActiveRecordShards
       result
     end
 
+    def autoload_adapter(adapter_name)
+      begin
+        require 'rubygems'
+        gem "activerecord-#{adapter_name}-adapter"
+        require "active_record/connection_adapters/#{adapter_name}_adapter"
+      rescue LoadError
+        begin
+          require "active_record/connection_adapters/#{adapter_name}_adapter"
+        rescue LoadError
+          raise "Please install the #{adapter_name} adapter: `gem install activerecord-#{adapter_name}-adapter` (#{$!})"
+        end
+      end
+
+      adapter_method = "#{adapter_name}_connection"
+      if !ActiveRecord::Base.respond_to?(adapter_name + "_connection")
+        raise AdapterNotFound, "database configuration specifies nonexistent #{adapter_name} adapter"
+      end
+    end
+
     class MasterSlaveProxy
       def initialize(target, which)
         @target = target

data/test/helper.rb

@@ -1,8 +1,11 @@
 require 'rubygems'
 require 'bundler'
+
 Bundler.setup
 Bundler.require(:default, :development)
 
+require 'mocha'
+
 if defined?(Debugger)
   ::Debugger.start
   ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,17 +120,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -147,22 +147,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yaggy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -240,18 +224,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -349916606155063800
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -349916606155063800
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24