active_record_shards 2.6.5 → 2.6.6

data/README.md

@@ -96,3 +96,6 @@ Copyright (c) 2011 Zendesk. See LICENSE for details.
 
 ## Authors
 Mick Staugaard, Eric Chapweske
+
+[![Build Status](https://secure.travis-ci.org/osheroff/active_record_shards.png)](http://travis-ci.org/osheroff/active_record_shards)
+

data/lib/active_record_shards/association_collection_connection_selection.rb

@@ -33,7 +33,7 @@ module ActiveRecordShards
       def method_missing(method, *args, &block)
         # would love to not rely on version here, unfortunately @association_collection
         # is a sensitive little bitch of an object.
-        if ActiveRecord::VERSION::MAJOR >= 3
+        if ActiveRecord::VERSION::STRING >= "3.1.0"
           reflection = @association_collection.proxy_association.reflection
         else
           reflection = @association_collection.proxy_reflection

data/lib/active_record_shards/connection_pool.rb

@@ -39,3 +39,18 @@ ActiveRecord::Base.singleton_class.class_eval do
   end
   alias_method_chain :establish_connection, :connection_pool_name
 end
+
+# backport improved connection fetching from rails 3.2
+if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
+  class ActiveRecord::Base
+    def self.arel_engine
+      @arel_engine ||= begin
+        if self == ActiveRecord::Base
+          ActiveRecord::Base
+        else
+          connection_handler.retrieve_connection_pool(self) ? self : superclass.arel_engine
+        end
+      end
+    end
+  end
+end

data/lib/active_record_shards/connection_switcher.rb

@@ -91,10 +91,10 @@ module ActiveRecordShards
       @disallow_slave = (@disallow_slave || 0) + 1 if which == :master
 
       # setting read-only scope on ActiveRecord::Base never made any sense, anyway
-      if self == ActiveRecord::Base
+      if self == ActiveRecord::Base || !switch_to_slave
         yield
       else
-        with_scope({:find => {:readonly => on_slave?}}, :merge, &block)
+        with_scope({:find => {:readonly => true}}, &block)
       end
     ensure
       @disallow_slave -= 1 if which == :master
@@ -177,7 +177,7 @@ module ActiveRecordShards
     end
 
     def connection_pool_key
-      if ActiveRecord::VERSION::MAJOR >= 3
+      if ActiveRecord::VERSION::STRING >= "3.1.0"
         specification_cache[connection_pool_name]
       else
         connection_pool_name

data/lib/active_record_shards/migration.rb

@@ -95,7 +95,7 @@ end
 ActiveRecord::Migration.class_eval do
   extend ActiveRecordShards::MigrationClassExtension
 
-  if ActiveRecord::VERSION::MAJOR >= 3
+  if ActiveRecord::VERSION::STRING >= "3.1.0"
     include ActiveRecordShards::ActualMigrationExtension
     define_method :migration_shard do
       self.class.migration_shard

data/lib/active_record_shards.rb

@@ -9,7 +9,7 @@ require 'active_record_shards/connection_pool'
 require 'active_record_shards/migration'
 require 'active_record_shards/default_slave_patches'
 
-if ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR >= 2
+if ActiveRecord::VERSION::STRING >= "3.2.0"
   require 'active_record_shards/connection_specification'
 end
 
@@ -18,7 +18,7 @@ ActiveRecord::Base.extend(ActiveRecordShards::Model)
 ActiveRecord::Base.extend(ActiveRecordShards::ConnectionSwitcher)
 ActiveRecord::Base.extend(ActiveRecordShards::DefaultSlavePatches)
 
-if ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR >= 1
+if ActiveRecord::VERSION::STRING >= "3.1.0"
   ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
 else
   ActiveRecord::Associations::AssociationCollection.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)

data/test/connection_switching_test.rb

@@ -186,6 +186,16 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
       assert_using_database('ars_test', Ticket)
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 3
+      should "be able to find by column" do
+        Account.where(:name => "peter").to_sql # does not blow up
+      end
+
+      should "have correct engine" do
+        assert_equal Account, Account.arel_engine
+      end
+    end
+
     context "shard switching" do
       should "just stay on the main db" do
         assert_using_database('ars_test2', Ticket)
@@ -320,6 +330,19 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
           assert_equal('master_name', @model.name)
         end
 
+        # TODO mocha raises stack level too deep on ActiveRecord 3.2+
+        if ActiveRecord::VERSION::STRING < "3.2.0"
+          should "not unnecessary call with_scope" do
+            Account.expects(:with_scope).never
+            Account.on_master.first
+          end
+        end
+
+        should "not unset readonly" do
+          @model = Account.on_master.scoped(:readonly => true).first
+          assert(@model.readonly?)
+        end
+
         should "not be marked as read only" do
           assert(!@model.readonly?)
         end

data/test/schema.rb

@@ -1,6 +1,4 @@
-old_stdout = $stdout.clone
-devnull = File.open("/dev/null", "w+")
-$stdout.reopen(devnull)
+ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table "accounts", :force => true do |t|
@@ -24,5 +22,3 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "updated_at"
   end
 end
-
-$stdout.reopen(old_stdout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -163,6 +163,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '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: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1805531677850049369
+      hash: -1200466778001401541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1805531677850049369
+      hash: -1200466778001401541
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24