active_record_host_pool 0.6.0 → 0.6.1

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -1,3 +1,9 @@
+require 'active_record/connection_adapters/mysql_adapter'
+begin
+  require 'active_record/connection_adapters/mysql2_adapter'
+rescue LoadError
+end
+
 module ActiveRecordHostPool
   module DatabaseSwitch
     def self.included(base)
@@ -77,4 +83,7 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval { include ActiveRecordHostPool::DatabaseSwitch }
+["MysqlAdapter", "Mysql2Adapter"].each do |k|
+  next unless ActiveRecord::ConnectionAdapters.const_defined?(k)
+  ActiveRecord::ConnectionAdapters.const_get(k).class_eval { include ActiveRecordHostPool::DatabaseSwitch }
+end

data/lib/active_record_host_pool/pool_proxy.rb

@@ -1,6 +1,5 @@
 require 'delegate'
 require 'active_record'
-require 'active_record/connection_adapters/mysql_adapter'
 require 'active_record_host_pool/connection_adapter_mixin'
 
 # this module sits in between ConnectionHandler and a bunch of different ConnectionPools (one per host).

data/test/helper.rb

@@ -16,7 +16,17 @@ require 'logger'
 RAILS_ENV = "test"
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+
+config =  YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+
+if ENV["BUNDLE_GEMFILE"] =~ /mysql2/
+  config.each do |k, v|
+    v['adapter'] = 'mysql2'
+  end
+end
+
+ActiveRecord::Base.configurations = config
+
 
 require 'active_support/test_case'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_record_host_pool
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Ben Osheroff