active_record_shards 2.5.3 → 2.5.4

data/lib/active_record_shards/finder_overrides.rb

@@ -1,25 +1,74 @@
 module ActiveRecordShards
   module FinderOverrides
-    SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate ]
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :columns, :sanitize_sql_hash_for_conditions ]
+
     def self.extended(base)
-      SLAVE_METHODS.each do |slave_method|
+      CLASS_SLAVE_METHODS.each do |slave_method|
         base.class_eval <<-EOF, __FILE__, __LINE__ + 1
           class <<self
-            def #{slave_method}_with_slave_by_default(*args, &block)
+            def #{slave_method}_with_default_slave(*args, &block)
               on_slave_unless_tx do
-                #{slave_method}_without_slave_by_default(*args, &block)
+                #{slave_method}_without_default_slave(*args, &block)
               end
             end
 
-            alias_method_chain :#{slave_method}, :slave_by_default
+            alias_method_chain :#{slave_method}, :default_slave if respond_to?(:#{slave_method})
           end
         EOF
       end
+
+      base.class_eval do
+        # fix ActiveRecord to do the right thing, and use our aliased quote_value
+        def quote_value(*args, &block)
+          self.class.quote_value(*args, &block)
+        end
+
+        class << self
+          def transaction_with_slave_off(*args, &block)
+            if on_slave_by_default?
+              old_val = Thread.current[:_active_record_shards_slave_off]
+              Thread.current[:_active_record_shards_slave_off] = true
+            end
+
+            transaction_without_slave_off(*args, &block)
+          ensure
+            if on_slave_by_default?
+              Thread.current[:_active_record_shards_slave_off] = old_val
+            end
+          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
     end
 
-    private
     def on_slave_unless_tx(&block)
-      if on_slave_by_default? && on_master.connection.open_transactions.zero?
+      if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
         on_slave { yield }
       else
         yield

data/test/configuration_parser_test.rb

@@ -9,6 +9,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
     context "main slave" do
       setup { @conf = @exploded_conf['test_slave'] }
       should "be exploded" do
+        @conf["shard_names"] = @conf["shard_names"].to_set
         assert_equal({
           "adapter"     => "mysql",
           "encoding"    => "utf8",
@@ -17,7 +18,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
           "username"    => "root",
           "password"    => nil,
           "host"        => "main_slave_host",
-          "shard_names" => ["a", "b"]
+          "shard_names" => ["a", "b"].to_set
         }, @conf)
       end
     end
@@ -26,6 +27,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
       context "master" do
         setup { @conf = @exploded_conf['test_shard_a'] }
         should "be exploded" do
+          @conf["shard_names"] = @conf["shard_names"].to_set
           assert_equal({
             "adapter"     => "mysql",
             "encoding"    => "utf8",
@@ -34,7 +36,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
             "username"    => "root",
             "password"    => nil,
             "host"        => "shard_a_host",
-            "shard_names" => ["a", "b"]
+            "shard_names" => ["a", "b"].to_set
           }, @conf)
         end
       end
@@ -42,6 +44,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
       context "slave" do
         setup { @conf = @exploded_conf['test_shard_a_slave'] }
         should "be exploded" do
+          @conf["shard_names"] = @conf["shard_names"].to_set
           assert_equal({
             "adapter"     => "mysql",
             "encoding"    => "utf8",
@@ -50,7 +53,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
             "username"    => "root",
             "password"    => nil,
             "host"        => "shard_a_slave_host",
-            "shard_names" => ["a", "b"]
+            "shard_names" => ["a", "b"].to_set
           }, @conf)
         end
       end
@@ -60,6 +63,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
       context "master" do
         setup { @conf = @exploded_conf['test_shard_b'] }
         should "be exploded" do
+          @conf["shard_names"] = @conf["shard_names"].to_set
           assert_equal({
             "adapter"     => "mysql",
             "encoding"    => "utf8",
@@ -68,7 +72,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
             "username"    => "root",
             "password"    => nil,
             "host"        => "shard_b_host",
-            "shard_names" => ["a", "b"]
+            "shard_names" => ["a", "b"].to_set
           }, @conf)
         end
       end
@@ -76,6 +80,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
       context "slave" do
         setup { @conf = @exploded_conf['test_shard_b_slave'] }
         should "be exploded" do
+          @conf["shard_names"] = @conf["shard_names"].to_set
           assert_equal({
             "adapter"     => "mysql",
             "encoding"    => "utf8",
@@ -84,7 +89,7 @@ class ConfigurationParserTest < ActiveSupport::TestCase
             "username"    => "root",
             "password"    => nil,
             "host"        => "shard_b_host",
-            "shard_names" => ["a", "b"]
+            "shard_names" => ["a", "b"].to_set
           }, @conf)
         end
       end

data/test/connection_switching_test.rb

@@ -352,41 +352,44 @@ class ConnectionSwitchenTest < ActiveSupport::TestCase
         end
       end
 
-      context "with finds routed to the slave by default" do
-        setup do
-          Account.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')")
-        end
+      # TODO: make all this stuff rails 3 compatible.
+      if Gem.loaded_specs['activerecord'].version < Gem::Version.create('3.0')
+        context "with finds routed to the slave by default" do
+          setup do
+            Account.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')")
+          end
 
-        should "find() by default on the slave" do
-          account = Account.find(1000)
-          assert_equal 'slave_name', account.name
-        end
+          should "find() by default on the slave" do
+            account = Account.find(1000)
+            assert_equal 'slave_name', account.name
+          end
 
-        should "count() by default on the slave" do
-          count = Account.all.size
-          assert_equal 2, count
-        end
+          should "count() by default on the slave" do
+            count = Account.all.size
+            assert_equal 2, count
+          end
 
-        should "Allow override using on_master" do
-          model = Account.on_master.find(1000)
-          assert_equal "master_name", model.name
-        end
+          should "Allow override using on_master" do
+            model = Account.on_master.find(1000)
+            assert_equal "master_name", model.name
+          end
 
-        should "not override on_master with on_slave" do
-          model = Account.on_master { Account.on_slave.find(1000) }
-          assert_equal "master_name", model.name
-        end
+          should "not override on_master with on_slave" do
+            model = Account.on_master { Account.on_slave.find(1000) }
+            assert_equal "master_name", model.name
+          end
 
-        should "override on_slave with on_master" do
-          model = Account.on_slave { Account.on_master.find(1000) }
-          assert_equal "master_name", model.name
-        end
+          should "override on_slave with on_master" do
+            model = Account.on_slave { Account.on_master.find(1000) }
+            assert_equal "master_name", model.name
+          end
 
-        teardown do
-          Account.on_slave_by_default = false
+          teardown do
+            Account.on_slave_by_default = false
+          end
         end
       end
     end