active_record_host_pool 0.6.1 → 0.6.2

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -1,7 +1,8 @@
-require 'active_record/connection_adapters/mysql_adapter'
-begin
-  require 'active_record/connection_adapters/mysql2_adapter'
-rescue LoadError
+['mysql_adapter', 'mysql2_adapter'].each do |adapter|
+  begin
+    require "active_record/connection_adapters/#{adapter}"
+  rescue LoadError
+  end
 end
 
 module ActiveRecordHostPool

data/lib/active_record_host_pool/pool_proxy.rb

@@ -27,10 +27,20 @@ module ActiveRecordHostPool
       @config = spec.config.with_indifferent_access
     end
 
+    def spec
+      @spec
+    end
 
     def connection(*args)
-      cx = _connection_pool.connection(*args)
-      _connection_proxy_for(cx, @config[:database])
+      begin
+        real_connection = _connection_pool.connection(*args)
+        _connection_proxy_for(real_connection, @config[:database])
+      rescue Exception => e
+        if rescuable_errors.any? { |r| e.is_a?(r) }
+          _connection_pools.delete(_pool_key)
+        end
+        raise(e)
+      end
     end
 
     # by the time we are patched into ActiveRecord, the current thread has already established
@@ -53,6 +63,8 @@ module ActiveRecordHostPool
     end
 
     def disconnect!
+      p = _connection_pool(false)
+      return unless p
       _connection_pool.disconnect!
       _connection_pool.automatic_reconnect = true if _connection_pool.respond_to?(:automatic_reconnect=)
       _clear_connection_proxy_cache
@@ -64,17 +76,30 @@ module ActiveRecordHostPool
     end
 
   private
+    def rescuable_errors
+      @rescuable_errors ||= begin
+        e = []
+        if Object.const_defined?("Mysql")
+          e << Mysql::Error
+        end
+        if Object.const_defined?("Mysql2")
+          e << Mysql2::Error
+        end
+        e
+      end
+    end
+
     def _connection_pools
-      @@connection_pools ||= {}
+      @@_connection_pools ||= {}
     end
 
     def _pool_key
-      [@config[:host], @config[:port], @config[:socket], @config[:username]]
+      [@config[:host], @config[:port], @config[:socket], @config[:username]].map(&:to_s).join("/")
     end
 
-    def _connection_pool
+    def _connection_pool(auto_create=true)
       pool = _connection_pools[_pool_key]
-      if pool.nil?
+      if pool.nil? && auto_create
         pool = _connection_pools[_pool_key] = ActiveRecord::ConnectionAdapters::ConnectionPool.new(@spec)
       end
       pool
@@ -84,7 +109,11 @@ module ActiveRecordHostPool
       @connection_proxy_cache ||= {}
       key = [connection, database]
 
-      @connection_proxy_cache[key] ||= ActiveRecordHostPool::ConnectionProxy.new(connection, database)
+      @connection_proxy_cache[key] ||= begin
+        cx = ActiveRecordHostPool::ConnectionProxy.new(connection, database)
+        cx.execute('select 1')
+        cx
+      end
     end
 
     def _clear_connection_proxy_cache

data/test/database.yml

@@ -45,3 +45,13 @@ test_host_2_db_5:
   host: 127.0.0.1
   port: 3306
   reconnect: true
+
+test_host_1_db_not_there:
+  adapter: mysql
+  encoding: utf8
+  database: arhp_test_no_create
+  username: root
+  password:
+  host: localhost
+  reconnect: true
+

data/test/helper.rb

@@ -34,6 +34,7 @@ class ActiveSupport::TestCase
   private
   def arhp_create_databases
     ActiveRecord::Base.configurations.each do |name, conf|
+      next if name =~ /not_there/
       `echo "drop DATABASE IF EXISTS #{conf['database']}" | mysql --user=#{conf['username']}`
       `echo "create DATABASE #{conf['database']}" | mysql --user=#{conf['username']}`
       ActiveRecord::Base.establish_connection(name)

data/test/test_arhp.rb

@@ -95,6 +95,31 @@ class ActiveRecordHostPoolTest < ActiveSupport::TestCase
     assert_equal expected_database, current_database(switch_to_klass)
   end
 
+  # rake db:create uses a pattern where it tries to connect to a non-existant database.
+  # but then we had this left in the connection pool cache.
+  # It's also almost impossible to test at this level, so I'm stubbing out the test
+  def _test_connecting_to_wrong_db_first
+    pools = ActiveRecord::Base.connection_handler.connection_pools
+    if !pools.empty?
+      ActiveRecord::Base.connection_handler.connection_pools.values.first.send(:_connection_pools).clear
+      ActiveRecord::Base.connection_handler.connection_pools.clear
+    end
+
+    begin
+      eval <<-EOC
+        class TestNotThere < ActiveRecord::Base
+          establish_connection("test_host_1_db_not_there")
+        end
+      EOC
+    rescue Exception => e
+      assert e.message =~ /Unknown database/
+    end
+
+    Test1.establish_connection("test_host_1_db_1")
+    # assert it doesn't raise.
+    assert Test1.connection
+  end
+
   def teardown
     arhp_drop_databases
   end

metadata

@@ -1,117 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_record_host_pool
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.6.2
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
 platform: ruby
-authors: 
+authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: ""
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
+email:
 - ben@gimbo.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - README.md
 - lib/active_record_host_pool.rb
 - lib/active_record_host_pool/connection_adapter_mixin.rb
@@ -124,38 +144,36 @@ files:
 - test/test_arhp.rb
 homepage: http://github.com/zendesk/active_record_host_pool
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4283844498504978406
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4283844498504978406
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Allow ActiveRecord to share a connection to multiple databases on the same host
-test_files: 
+summary: Allow ActiveRecord to share a connection to multiple databases on the same
+  host
+test_files:
 - test/database.yml
 - test/helper.rb
 - test/schema.rb