active_record_host_pool 0.5.3 → 0.6.0

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -66,8 +66,15 @@ module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandler
       def establish_connection(name, spec)
-        @connection_pools[name] = ActiveRecordHostPool::PoolProxy.new(spec)
+        if @class_to_pool # AR 3.2
+          @connection_pools[spec] ||= ActiveRecordHostPool::PoolProxy.new(spec)
+          @class_to_pool[name] = @connection_pools[spec]
+        else # AR 3.1 and lower
+          @connection_pools[name] = ActiveRecordHostPool::PoolProxy.new(spec)
+        end
       end
     end
   end
 end
+
+ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval { include ActiveRecordHostPool::DatabaseSwitch }

data/lib/active_record_host_pool/pool_proxy.rb

@@ -94,4 +94,3 @@ module ActiveRecordHostPool
   end
 end
 
-ActiveRecord::ConnectionAdapters::MysqlAdapter.class_eval { include ActiveRecordHostPool::DatabaseSwitch }

data/test/helper.rb

@@ -42,27 +42,27 @@ class ActiveSupport::TestCase
     return if Object.const_defined?("Test1")
     eval <<-EOL
       class Test1 < ActiveRecord::Base
-        set_table_name "tests"
+        self.table_name = "tests"
         establish_connection("test_host_1_db_1")
       end
 
       class Test2 < ActiveRecord::Base
-        set_table_name "tests"
+        self.table_name =  "tests"
         establish_connection("test_host_1_db_2")
       end
 
       class Test3 < ActiveRecord::Base
-        set_table_name "tests"
+        self.table_name = "tests"
         establish_connection("test_host_2_db_3")
       end
 
       class Test4 < ActiveRecord::Base
-        set_table_name "tests"
+        self.table_name = "tests"
         establish_connection("test_host_2_db_4")
       end
 
       class Test5 < ActiveRecord::Base
-        set_table_name "tests"
+        self.table_name = "tests"
         establish_connection("test_host_2_db_5")
       end
     EOL

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_record_host_pool
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ben Osheroff
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 -07:00
-default_executable: 
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -123,7 +122,6 @@ files:
 - test/helper.rb
 - test/schema.rb
 - test/test_arhp.rb
-has_rdoc: true
 homepage: http://github.com/zendesk/active_record_host_pool
 licenses: []
 
@@ -153,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Allow ActiveRecord to share a connection to multiple databases on the same host