active_record_host_pool 0.6.4 → 0.6.5

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -67,6 +67,11 @@ module ActiveRecordHostPool
         @_cached_connection_object_id = @connection.object_id
       end
     end
+
+    # prevent different databases from sharing the same query cache
+    def cache_sql(sql, *args)
+      super(_host_pool_current_database.to_s + "/" + sql, *args)
+    end
   end
 end
 

data/test/helper.rb

@@ -1,14 +1,9 @@
-Bundler.require(:default, :development)
+require 'bundler/setup'
+require 'test/unit'
 
-if defined?(Debugger)
-  ::Debugger.start
-  ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
-end
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'active_record_host_pool'
 require 'logger'
+require 'mocha/setup'
 
 RAILS_ENV = "test"
 
@@ -24,10 +19,7 @@ end
 
 ActiveRecord::Base.configurations = config
 
-
-require 'active_support/test_case'
-
-class ActiveSupport::TestCase
+module ARHPTestSetup
   private
   def arhp_create_databases
     ActiveRecord::Base.configurations.each do |name, conf|

data/test/test_arhp.rb

@@ -1,6 +1,7 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
-class ActiveRecordHostPoolTest < ActiveSupport::TestCase
+class ActiveRecordHostPoolTest < Test::Unit::TestCase
+  include ARHPTestSetup
   def setup
     arhp_create_databases
     arhp_create_models
@@ -31,6 +32,14 @@ class ActiveRecordHostPoolTest < ActiveSupport::TestCase
     assert Test1.connection.is_a?(ActiveRecordHostPool::ConnectionProxy)
   end
 
+  def test_should_not_share_a_query_cache
+    Test1.create(:val => 'foo')
+    Test2.create(:val => 'foobar')
+    Test1.connection.cache do
+      assert Test1.first.val != Test2.first.val
+    end
+  end
+
   def test_object_creation
     Test1.create(:val => 'foo')
     assert_equal("arhp_test_1", current_database(Test1))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -27,134 +27,6 @@ dependencies:
     - - ! '>='
       - !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
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    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
-  prerelease: false
-  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
-        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: mysql2
-  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: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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: debugger
-  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'
 description: ''
 email:
 - ben@gimbo.net
@@ -195,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Allow ActiveRecord to share a connection to multiple databases on the same
@@ -205,3 +77,4 @@ test_files:
 - test/helper.rb
 - test/schema.rb
 - test/test_arhp.rb
+has_rdoc: