active_record_shards 2.6.6 → 2.6.7

data/lib/active_record_shards/connection_pool.rb

@@ -40,15 +40,15 @@ ActiveRecord::Base.singleton_class.class_eval do
   alias_method_chain :establish_connection, :connection_pool_name
 end
 
-# backport improved connection fetching from rails 3.2
+# old_code.sub('name', 'connection_pool_name')
 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
+          Arel::Table.engine
         else
-          connection_handler.retrieve_connection_pool(self) ? self : superclass.arel_engine
+          connection_handler.connection_pools[connection_pool_name] ? self : superclass.arel_engine
         end
       end
     end

data/lib/active_record_shards/connection_switcher.rb

@@ -26,12 +26,12 @@ module ActiveRecordShards
     def on_all_shards(&block)
       old_options = current_shard_selection.options
       if supports_sharding?
-        shard_names.each do |shard|
+        shard_names.map do |shard|
           switch_connection(:shard => shard)
           yield(shard)
         end
       else
-        yield
+        [yield]
       end
     ensure
       switch_connection(old_options)
@@ -83,15 +83,16 @@ module ActiveRecordShards
     alias_method :with_slave_if, :on_slave_if
     alias_method :with_slave_unless, :on_slave_unless
 
-    def on_cx_switch_block(which, &block)
+    def on_cx_switch_block(which, options = {}, &block)
       old_options = current_shard_selection.options
       switch_to_slave = (which == :slave && (@disallow_slave.nil? || @disallow_slave == 0))
       switch_connection(:slave => switch_to_slave)
 
       @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 || !switch_to_slave
+      # we avoid_readonly_scope to prevent some stack overflow problems, like when
+      # .columns calls .with_scope which calls .columns and onward, endlessly.
+      if self == ActiveRecord::Base || !switch_to_slave || options[:construct_ro_scope] == false
         yield
       else
         with_scope({:find => {:readonly => true}}, &block)

data/lib/active_record_shards/default_slave_patches.rb

@@ -1,12 +1,12 @@
 module ActiveRecordShards
   module DefaultSlavePatches
-    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :columns, :sanitize_sql_hash_for_conditions ]
+    CLASS_SLAVE_METHODS = [ :find_by_sql, :count_by_sql, :calculate, :find_one, :find_some, :find_every, :quote_value, :sanitize_sql_hash_for_conditions ]
 
     def self.extended(base)
       base_methods = (base.methods | base.private_methods).map(&:to_sym)
       (CLASS_SLAVE_METHODS & base_methods).each do |slave_method|
-        base.class_eval <<-EOF, __FILE__, __LINE__ + 1
-          class <<self
+        base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          class << self
             def #{slave_method}_with_default_slave(*args, &block)
               on_slave_unless_tx do
                 #{slave_method}_without_default_slave(*args, &block)
@@ -15,7 +15,7 @@ module ActiveRecordShards
 
             alias_method_chain :#{slave_method}, :default_slave
           end
-        EOF
+        RUBY
       end
 
       base.class_eval do
@@ -29,6 +29,19 @@ module ActiveRecordShards
         end
         alias_method_chain :reload, :slave_off
 
+        class << self
+          def columns_with_default_slave(*args, &block)
+            if on_slave_by_default? && !Thread.current[:_active_record_shards_slave_off]
+              read_columns_from = :slave
+            else
+              read_columns_form = :master
+            end
+
+            on_cx_switch_block(read_columns_from, :construct_ro_scope => false) { columns_without_default_slave(*args, &block) }
+          end
+          alias_method_chain :columns, :default_slave
+        end
+
         class << self
           def transaction_with_slave_off(*args, &block)
             if on_slave_by_default?

data/lib/active_record_shards/tasks.rb

@@ -1,27 +1,20 @@
 require 'active_record_shards'
 
-Rake::TaskManager.class_eval do
-  def remove_task(task_name)
-    @tasks.delete(task_name.to_s)
-  end
-end
-
-def remove_task(task_name)
-  Rake.application.remove_task(task_name)
+%w[db:drop db:create db:abort_if_pending_migrations db:reset].each do |name|
+  Rake.application.instance_variable_get(:@tasks).delete(name) || warn("could not delete #{name} task, potential load-order problem")
 end
 
-remove_task 'db:drop'
-remove_task 'db:create'
-remove_task 'db:abort_if_pending_migrations'
-remove_task 'db:reset'
-
 namespace :db do
   desc 'Drops the database for the current RAILS_ENV including shards and slaves'
   task :drop => :load_config do
     env_name = defined?(Rails.env) ? Rails.env : RAILS_ENV || 'development'
     ActiveRecord::Base.configurations.each do |key, conf|
       if key.starts_with?(env_name) && !key.ends_with?("_slave")
-        drop_database(conf)
+        begin
+          drop_database(conf)
+        rescue Exception => e
+          puts "Couldn't drop #{conf['database']} : #{e.inspect}"
+        end
       end
     end
   end

data/test/connection_switching_test.rb

@@ -46,22 +46,30 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
         @shard_0_master = ActiveRecord::Base.on_shard(0) {ActiveRecord::Base.connection}
         @shard_1_master = ActiveRecord::Base.on_shard(1) {ActiveRecord::Base.connection}
         assert_not_equal(@shard_0_master.select_value("SELECT DATABASE()"), @shard_1_master.select_value("SELECT DATABASE()"))
+      end
 
-        @database_names = []
-        @database_shards = []
-        ActiveRecord::Base.on_all_shards do |shard|
-          @database_names << ActiveRecord::Base.connection.select_value("SELECT DATABASE()")
-          @database_shards << shard
+      should "execute the block on all shard masters" do
+        result = ActiveRecord::Base.on_all_shards do |shard|
+          [ActiveRecord::Base.connection.select_value("SELECT DATABASE()"), shard]
         end
+        database_names = result.map(&:first)
+        database_shards = result.map(&:last)
+
+        assert_equal(2, database_names.size)
+        assert_contains(database_names, @shard_0_master.select_value("SELECT DATABASE()"))
+        assert_contains(database_names, @shard_1_master.select_value("SELECT DATABASE()"))
+
+        assert_equal(2, database_shards.size)
+        assert_contains(database_shards, "0")
+        assert_contains(database_shards, "1")
       end
 
-      should "execute the block on all shard masters" do
-        assert_equal(2, @database_names.size)
-        assert_contains(@database_names, @shard_0_master.select_value("SELECT DATABASE()"))
-        assert_contains(@database_names, @shard_1_master.select_value("SELECT DATABASE()"))
-        assert_equal(2, @database_shards.size)
-        assert_contains(@database_shards, "0")
-        assert_contains(@database_shards, "1")
+      should "execute the block unsharded" do
+        ActiveRecord::Base.expects(:supports_sharding?).returns false
+        result = ActiveRecord::Base.on_all_shards do |shard|
+          [ActiveRecord::Base.connection.select_value("SELECT DATABASE()"), shard]
+        end
+        assert_equal [["ars_test", nil]], result
       end
     end
   end
@@ -322,6 +330,18 @@ class ConnectionSwitchingTest < ActiveSupport::TestCase
         end
       end
 
+      context "a inherited model without cached columns hash" do
+        # before columns -> with_scope -> type-condition -> columns == loop
+        should "not loop when on slave by default" do
+          Person.on_slave_by_default = true
+          assert User.on_slave_by_default?
+          assert User.finder_needs_type_condition?
+
+          User.instance_variable_set(:@columns_hash, nil)
+          User.columns_hash
+        end
+      end
+
       context "a model loaded with the master" do
         setup do
           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')")

data/test/models.rb

@@ -17,3 +17,11 @@ class Ticket < ActiveRecord::Base
   # attributes: id, title, account_id, updated_at, created_at
   belongs_to :account
 end
+
+class Person < ActiveRecord::Base
+  not_sharded
+end
+
+class User < Person
+end
+

data/test/schema.rb

@@ -21,4 +21,11 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
+
+  create_table "people", :force => true do |t|
+    t.string "name"
+    t.string "type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -242,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1200466778001401541
+      hash: -349916606155063800
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1200466778001401541
+      hash: -349916606155063800
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24