active_record_shards 2.7.5 → 2.8.0

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,23 +1,32 @@
 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? ]
+    def self.wrap_method_in_on_slave(class_method, base, method)
 
-    def self.extended(base)
-      base_methods = (base.methods | base.private_methods).map(&:to_sym)
-      (CLASS_SLAVE_METHODS & base_methods).each do |slave_method|
-        _, slave_method, punctuation = slave_method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
-        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          class << self
-            def #{slave_method}_with_default_slave#{punctuation}(*args, &block)
-              on_slave_unless_tx do
-                #{slave_method}_without_default_slave#{punctuation}(*args, &block)
-              end
-            end
+      if class_method
+        base_methods = (base.methods | base.private_methods).map(&:to_sym)
+      else
+        base_methods = (base.instance_methods | base.private_instance_methods).map(&:to_sym)
+      end
 
-            alias_method_chain :#{slave_method}#{punctuation}, :default_slave
+      return unless base_methods.include?(method)
+      _, method, punctuation = method.to_s.match(/^(.*?)([\?\!]?)$/).to_a
+      base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        #{class_method ? "class << self" : ""}
+          def #{method}_with_default_slave#{punctuation}(*args, &block)
+            on_slave_unless_tx do
+              #{method}_without_default_slave#{punctuation}(*args, &block)
+            end
           end
-        RUBY
-      end
+
+          alias_method_chain :#{method}#{punctuation}, :default_slave
+        #{class_method ? "end" : ""}
+      RUBY
+    end
+
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql,  :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions, :exists?, :table_exists? ]
+
+    def self.extended(base)
+      CLASS_SLAVE_METHODS.each { |m| ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(true, base, m) }
 
       base.class_eval do
         # fix ActiveRecord to do the right thing, and use our aliased quote_value
@@ -58,33 +67,10 @@ module ActiveRecordShards
           end
 
           alias_method_chain :transaction, :slave_off
-
-
-          def table_exists_with_default_slave?(*args)
-            on_slave_unless_tx(*args) { table_exists_without_default_slave?(*args) }
-          end
-
-          alias_method_chain :table_exists?, :default_slave
         end
       end
-
-
-      ActiveRecord::Associations::HasAndBelongsToManyAssociation.class_eval do
-        def construct_sql_with_default_slave(*args, &block)
-          on_slave_unless_tx do
-            construct_sql_without_default_slave(*args, &block)
-          end
-        end
-
-        def construct_find_options_with_default_slave!(*args, &block)
-          on_slave_unless_tx do
-            construct_find_options_without_default_slave!(*args, &block)
-          end
-        end
-
-        alias_method_chain :construct_sql,           :default_slave if respond_to?(:construct_sql)
-        alias_method_chain :construct_find_options!, :default_slave if respond_to?(:construct_find_options!)
-      end
+      ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, ActiveRecord::Associations::HasAndBelongsToManyAssociation, :construct_sql)
+      ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, ActiveRecord::Associations::HasAndBelongsToManyAssociation, :construct_find_options!)
     end
 
     def on_slave_unless_tx(&block)
@@ -97,20 +83,23 @@ module ActiveRecordShards
 
     module ActiveRelationPatches
       def self.included(base)
-        base.send :alias_method_chain, :calculate, :default_slave
-        base.send :alias_method_chain, :exists?, :default_slave
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :calculate)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :exists?)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :pluck)
       end
 
       def on_slave_unless_tx
         @klass.on_slave_unless_tx { yield }
       end
+    end
 
-      def calculate_with_default_slave(*args, &block)
-        on_slave_unless_tx { calculate_without_default_slave(*args, &block) }
+    module HasAndBelongsToManyPreloaderPatches
+      def self.included(base)
+        ActiveRecordShards::DefaultSlavePatches.wrap_method_in_on_slave(false, base, :records_for) rescue nil
       end
 
-      def exists_with_default_slave?(*args, &block)
-        on_slave_unless_tx { exists_without_default_slave?(*args, &block) }
+      def on_slave_unless_tx
+        klass.on_slave_unless_tx { yield }
       end
     end
   end

data/lib/active_record_shards.rb

@@ -22,6 +22,10 @@ if ActiveRecord.const_defined?(:Relation)
   ActiveRecord::Relation.send(:include, ActiveRecordShards::DefaultSlavePatches::ActiveRelationPatches)
 end
 
+if ActiveRecord::Associations.const_defined?(:Preloader)
+  ActiveRecord::Associations::Preloader::HasAndBelongsToMany.send(:include, ActiveRecordShards::DefaultSlavePatches::HasAndBelongsToManyPreloaderPatches)
+end
+
 if ActiveRecord::VERSION::STRING >= "3.1.0"
   ActiveRecord::Associations::CollectionProxy.send(:include, ActiveRecordShards::AssociationCollectionConnectionSelection)
 else

data/test/connection_switching_test.rb

@@ -380,13 +380,19 @@ describe "connection switching" do
         end
       end
 
-      # TODO: make all this stuff rails 3 compatible.
       describe "with finds routed to the slave by default" do
         before do
           Account.on_slave_by_default = true
+          Person.on_slave_by_default = true
           Account.connection.execute("INSERT INTO accounts (id, name, created_at, updated_at) VALUES(1000, 'master_name', '2009-12-04 20:18:48', '2009-12-04 20:18:48')")
           Account.on_slave.connection.execute("INSERT INTO accounts (id, name, created_at, updated_at) VALUES(1000, 'slave_name', '2009-12-04 20:18:48', '2009-12-04 20:18:48')")
           Account.on_slave.connection.execute("INSERT INTO accounts (id, name, created_at, updated_at) VALUES(1001, 'slave_name2', '2009-12-04 20:18:48', '2009-12-04 20:18:48')")
+
+          Person.connection.execute("REPLACE INTO people(id, name) VALUES(10, 'master person')")
+          Person.on_slave.connection.execute("REPLACE INTO people(id, name) VALUES(20, 'slave person')")
+
+          Account.connection.execute("INSERT INTO account_people(account_id, person_id) VALUES(1000, 10)")
+          Account.on_slave.connection.execute("INSERT INTO account_people(account_id, person_id) VALUES(1001, 20)")
         end
 
         it "find() by default on the slave" do
@@ -445,8 +451,21 @@ describe "connection switching" do
           assert AccountInherited.on_slave_by_default?
         end
 
+        it "will :include things via has_and_belongs associations correctly" do
+          a = Account.first(:conditions => "id = 1001", :include => :people)
+          assert a.people.size > 0
+          assert_equal 'slave person', a.people.first.name
+        end
+
+        if ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR >= 2
+          it "supports .pluck" do
+            assert_equal ["slave_name", "slave_name2"], Account.pluck(:name)
+          end
+        end
+
         after do
           Account.on_slave_by_default = false
+          Person.on_slave_by_default = false
         end
       end
     end

data/test/models.rb

@@ -4,6 +4,7 @@ class Account < ActiveRecord::Base
 
   has_many :tickets
   has_many :account_things
+  has_and_belongs_to_many :people, :join_table => 'account_people'
 end
 
 class AccountThing < ActiveRecord::Base
@@ -36,3 +37,4 @@ end
 class User < Person
 end
 
+

data/test/schema.rb

@@ -12,6 +12,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.boolean "enabled", :default => true
   end
 
+  create_table "account_people", :force => true, :id => false do |t|
+    t.integer "account_id"
+    t.integer "person_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.5
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1623971940010890811
+      hash: -479183148352030802
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1623971940010890811
+      hash: -479183148352030802
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25