active_record_host_pool 0.5.2 → 0.5.3

data/lib/active_record_host_pool/pool_proxy.rb

@@ -1,4 +1,7 @@
 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).
 # when a connection is requested, it goes like:
@@ -80,16 +83,9 @@ module ActiveRecordHostPool
 
     def _connection_proxy_for(connection, database)
       @connection_proxy_cache ||= {}
-      if !connection.respond_to?(:_host_pool_current_database)
-        connection.class.class_eval { include ActiveRecordHostPool::DatabaseSwitch }
-      end
       key = [connection, database]
 
-      proxy = @connection_proxy_cache[key]
-      if !proxy
-        proxy = @connection_proxy_cache[key] = ActiveRecordHostPool::ConnectionProxy.new(connection, database)
-      end
-      proxy
+      @connection_proxy_cache[key] ||= ActiveRecordHostPool::ConnectionProxy.new(connection, database)
     end
 
     def _clear_connection_proxy_cache
@@ -97,3 +93,5 @@ module ActiveRecordHostPool
     end
   end
 end
+
+ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval { include ActiveRecordHostPool::DatabaseSwitch }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_record_host_pool
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ben Osheroff