active_record_shards 2.7.1 → 2.7.2

data/README.md

@@ -3,8 +3,8 @@
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
 switch between database connection. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
 
-ActiveRecord Shards has only been used and tested on Rails 2.3.x, and has in some form or another been used on in production on a large rails app for
-more than a year!
+ActiveRecord Shards has used and tested on Rails 2.3.x, 3.0.x, and 3.2.x and has in some form or another been used on in production on a large rails app for
+more than a year.
 
 ## Installation
 

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,6 +1,6 @@
 module ActiveRecordShards
   module DefaultSlavePatches
-    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists? ]
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql,  :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists? ]
 
     def self.extended(base)
       base_methods = (base.methods | base.private_methods).map(&:to_sym)
@@ -94,5 +94,19 @@ module ActiveRecordShards
         yield
       end
     end
+
+    module ActiveRelationPatches
+      def self.included(base)
+        base.send :alias_method_chain, :calculate, :default_slave
+      end
+
+      def on_slave_unless_tx
+        @klass.on_slave_unless_tx { yield }
+      end
+
+      def calculate_with_default_slave(*args, &block)
+        on_slave_unless_tx { calculate_without_default_slave(*args, &block) }
+      end
+    end
   end
 end

data/lib/active_record_shards.rb

@@ -18,6 +18,10 @@ ActiveRecord::Base.extend(ActiveRecordShards::Model)
 ActiveRecord::Base.extend(ActiveRecordShards::ConnectionSwitcher)
 ActiveRecord::Base.extend(ActiveRecordShards::DefaultSlavePatches)
 
+if ActiveRecord.const_defined?(:Relation)
+  ActiveRecord::Relation.send(:include, ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
+end
+
 if ActiveRecord::VERSION::STRING >= "3.1.0"
   ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
 else

data/test/connection_switching_test.rb

@@ -402,6 +402,14 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
           end
         end
 
+        should "count associations on the slave" do
+          AccountThing.on_slave_by_default = true
+          Account.on_slave.connection.execute("INSERT INTO account_things (id, account_id) VALUES(123123, 1000)")
+          Account.on_slave.connection.execute("INSERT INTO account_things (id, account_id) VALUES(123124, 1000)")
+          assert_equal 2, Account.find(1000).account_things.size
+          AccountThing.on_slave_by_default = false
+        end
+
         should "Allow override using on_master" do
           model = Account.on_master.find(1000)
           assert_equal "master_name", model.name

data/test/models.rb

@@ -3,6 +3,11 @@ class Account < ActiveRecord::Base
   not_sharded
 
   has_many :tickets
+  has_many :account_things
+end
+
+class AccountThing < ActiveRecord::Base
+  not_sharded
 end
 
 class Email < ActiveRecord::Base

data/test/schema.rb

@@ -7,6 +7,10 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "updated_at"
   end
 
+  create_table "account_things", :force => true do |t|
+    t.integer "account_id"
+  end
+
   create_table "emails", :force => true do |t|
     t.string   "from"
     t.string   "to"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord