ar-octopus 0.9.2 → 0.10.0

data/lib/octopus/proxy_config.rb

@@ -132,7 +132,7 @@ module Octopus
     end
 
     def initialize_shards(config)
-      self.config = config
+      @original_config = config
 
       self.shards = HashWithIndifferentAccess.new
       self.shards_slave_groups = HashWithIndifferentAccess.new
@@ -210,6 +210,10 @@ module Octopus
       @slaves_load_balancer = Octopus.load_balancer.new(@slaves_list)
     end
 
+    def reinitialize_shards
+      initialize_shards(@original_config)
+    end
+
     private
 
     def connection_pool_for(config, adapter)
@@ -224,13 +228,8 @@ module Octopus
     end
 
     def resolve_string_connection(spec)
-      if Octopus.rails41? || Octopus.rails50? || Octopus.rails51?
-        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new({})
-        HashWithIndifferentAccess.new(resolver.spec(spec).config)
-      else
-        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(spec, {})
-        HashWithIndifferentAccess.new(resolver.spec.config)
-      end
+      resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new({})
+      HashWithIndifferentAccess.new(resolver.spec(spec).config)
     end
 
     def structurally_slave?(config)

data/lib/octopus/query_cache_for_shards.rb

@@ -0,0 +1,24 @@
+# query cache methods are moved to ConnectionPool for Rails >= 5.0
+module Octopus
+  module ConnectionPool
+    module QueryCacheForShards
+      %i(enable_query_cache! disable_query_cache!).each do |method|
+        define_method(method) do
+          if(Octopus.enabled? && (shards = ActiveRecord::Base.connection.shards)['master'] == self)
+            shards.each do |shard_name, v|
+              if shard_name == 'master'
+                super()
+              else
+                v.public_send(method)
+              end
+            end
+          else
+            super()
+          end
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::ConnectionPool.send(:prepend, Octopus::ConnectionPool::QueryCacheForShards)

data/lib/octopus/relation_proxy.rb

@@ -20,8 +20,17 @@ module Octopus
       method_missing(:respond_to?, *args)
     end
 
+    # methods redefined in ActiveRecord that should run_on_shard
+    ENUM_METHODS = (::Enumerable.instance_methods - ::Object.instance_methods).reject do |m|
+      ::ActiveRecord::Relation.instance_method(m).source_location rescue nil
+    end + [:each, :map, :index_by]
+    # `find { ... }` etc. should run_on_shard, `find(id)` should be sent to relation
+    ENUM_WITH_BLOCK_METHODS = [:find, :select, :none?, :any?, :one?, :many?, :sum]
+
     def method_missing(method, *args, &block)
-      if block
+      if ENUM_METHODS.include?(method) || block && ENUM_WITH_BLOCK_METHODS.include?(method)
+        run_on_shard { @ar_relation.to_a }.public_send(method, *args, &block)
+      elsif block
         @ar_relation.public_send(method, *args, &block)
       else
         run_on_shard do

data/lib/octopus/scope_proxy.rb

@@ -44,7 +44,7 @@ module Octopus
     end
 
     def method_missing(method, *args, &block)
-      result = run_on_shard { @klass.send(method, *args, &block) }
+      result = run_on_shard { @klass.__send__(method, *args, &block) }
       if result.respond_to?(:all)
         return ::Octopus::ScopeProxy.new(current_shard, result)
       end

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 end

data/spec/octopus/association_shard_tracking_spec.rb

@@ -196,6 +196,92 @@ describe Octopus::AssociationShardTracking, :shards => [:brazil, :master, :canad
         expect(@permission_brazil_2.roles.first).to be_nil
       end
 
+      it 'where' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1')).to eq([role])
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1')).to be_empty
+      end
+
+      it 'map' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.map(&:id)).to eq([role.id])
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.map(&:id)).to be_empty
+      end
+
+      it 'where + map' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').map(&:id)).to eq([role.id])
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').map(&:id)).to be_empty
+      end
+
+      # each_with_index is not listed in active_record/relation/delegation.rb
+      it 'where + each_with_index + map (enum method chain)' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to eq([[role.id, 0]])
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to be_empty
+      end
+
+      # sum & index_by is specialized in active_support/core_ext/enumerable.rb
+      it 'where + sum' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').sum(&:id)).to eq(role.id)
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').sum(&:id)).to eq(0)
+      end
+
+      it 'where + index_by' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').index_by(&:id)).to eq(role.id => role)
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').index_by(&:id)).to be_empty
+      end
+
+      it 'where + find' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').find([role.id])).to eq([role])
+        @permission_brazil_2.roles.destroy_all
+        expect { @permission_brazil_2.roles.where('1=1').find([role.id]) }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'where + find with block' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').find { |r| r.id == role.id }).to eq(role)
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').find { |r| r.id == role.id }).to be_nil
+      end
+
+      it 'where + select' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').select(:name).first.name).to eq(role.name)
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').select(:name)).to be_empty
+      end
+
+      it 'where + select with block' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').select { |r| r.id == role.id }).to eq([role])
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').select { |r| r.id == role.id }).to be_empty
+      end
+
+      it 'where + any?' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').any?).to be true
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').any?).to be false
+      end
+
+      it 'where + any? with block' do
+        role = @permission_brazil_2.roles.create(:name => 'Builded Role')
+        expect(@permission_brazil_2.roles.where('1=1').any? { |r| r.id == role.id }).to be true
+        @permission_brazil_2.roles.destroy_all
+        expect(@permission_brazil_2.roles.where('1=1').any? { |r| r.id == role.id }).to be false
+      end
+
       it 'exists?' do
         role = @permission_brazil_2.roles.create(:name => 'Builded Role')
         expect(@permission_brazil_2.roles.exists?(role.id)).to be true
@@ -350,6 +436,90 @@ describe Octopus::AssociationShardTracking, :shards => [:brazil, :master, :canad
         expect(@new_brazil_programmer.projects.first).to be_nil
       end
 
+      it 'where' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1')).to eq([role])
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1')).to be_empty
+      end
+
+      it 'map' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.map(&:id)).to eq([role.id])
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.map(&:id)).to be_empty
+      end
+
+      it 'where + map' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').map(&:id)).to eq([role.id])
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').map(&:id)).to be_empty
+      end
+
+      it 'where + each_with_index + map (enum method chain)' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').each_with_index.map { |r, i| [r.id, i] }).to eq([[role.id, 0]])
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').each_with_index.map { |r, i| [r.id, i] }).to be_empty
+      end
+
+      it 'where + sum' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').sum(&:id)).to eq(role.id)
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').sum(&:id)).to eq(0)
+      end
+
+      it 'where + index_by' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').index_by(&:id)).to eq(role.id => role)
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').index_by(&:id)).to be_empty
+      end
+
+      it 'where + find' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').find(role.id)).to eq(role)
+        @new_brazil_programmer.projects.destroy_all
+        expect { @new_brazil_programmer.projects.where('1=1').find(role.id) }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'where + find with block' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').find { |r| r.id == role.id }).to eq(role)
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').find { |r| r.id == role.id }).to be_nil
+      end
+
+      it 'where + select' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').select(:name).first.name).to eq(role.name)
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').select(:name)).to be_empty
+      end
+
+      it 'where + select with block' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').select { |r| r.id == role.id }).to eq([role])
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').select { |r| r.id == role.id }).to be_empty
+      end
+
+      it 'where + any?' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').any?).to be true
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').any?).to be false
+      end
+
+      it 'where + any? with block' do
+        role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
+        expect(@new_brazil_programmer.projects.where('1=1').any? { |r| r.id == role.id }).to be true
+        @new_brazil_programmer.projects.destroy_all
+        expect(@new_brazil_programmer.projects.where('1=1').any? { |r| r.id == role.id }).to be false
+      end
+
       it 'exists?' do
         role = @new_brazil_programmer.projects.create(:name => 'New VB App :-/')
         expect(@new_brazil_programmer.projects.exists?(role.id)).to be true
@@ -545,6 +715,78 @@ describe Octopus::AssociationShardTracking, :shards => [:brazil, :master, :canad
         expect(@brazil_client.items.first).to be_nil
       end
 
+      it 'where' do
+        expect(@brazil_client.items.where('1=1')).to eq([@item_brazil])
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1')).to be_empty
+      end
+
+      it 'map' do
+        expect(@brazil_client.items.map(&:id)).to eq([@item_brazil.id])
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.map(&:id)).to be_empty
+      end
+
+      it 'where + map' do
+        expect(@brazil_client.items.where('1=1').map(&:id)).to eq([@item_brazil.id])
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').map(&:id)).to be_empty
+      end
+
+      it 'where + each_with_index + map (enum method chain)' do
+        expect(@brazil_client.items.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to eq([[@item_brazil.id, 0]])
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to be_empty
+      end
+
+      it 'where + sum' do
+        expect(@brazil_client.items.where('1=1').sum(&:id)).to eq(@item_brazil.id)
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').sum(&:id)).to eq(0)
+      end
+
+      it 'where + index_by' do
+        expect(@brazil_client.items.where('1=1').index_by(&:id)).to eq(@item_brazil.id => @item_brazil)
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').index_by(&:id)).to be_empty
+      end
+
+      it 'where + find' do
+        expect(@brazil_client.items.where('1=1').find(@item_brazil.id)).to eq(@item_brazil)
+        @brazil_client.items.destroy_all
+        expect { @brazil_client.items.where('1=1').find(@item_brazil.id) }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'where + find with block' do
+        expect(@brazil_client.items.where('1=1').find { |i| i.id == @item_brazil.id }).to eq(@item_brazil)
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').find { |i| i.id == @item_brazil.id }).to be_nil
+      end
+
+      it 'where + select' do
+        expect(@brazil_client.items.where('1=1').select(:name).first.name).to eq(@item_brazil.name)
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').select(:name)).to be_empty
+      end
+
+      it 'where + select with block' do
+        expect(@brazil_client.items.where('1=1').select { |i| i.id == @item_brazil.id }).to eq([@item_brazil])
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').select { |i| i.id == @item_brazil.id }).to be_empty
+      end
+
+      it 'where + any?' do
+        expect(@brazil_client.items.where('1=1').any?).to be true
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').any?).to be false
+      end
+
+      it 'where + any? with block' do
+        expect(@brazil_client.items.where('1=1').any? { |i| i.id == @item_brazil.id }).to be true
+        @brazil_client.items.destroy_all
+        expect(@brazil_client.items.where('1=1').any? { |i| i.id == @item_brazil.id }).to be false
+      end
+
       it 'exists?' do
         expect(@brazil_client.items.exists?(@item_brazil.id)).to be true
         @brazil_client.items.destroy_all
@@ -695,6 +937,78 @@ describe Octopus::AssociationShardTracking, :shards => [:brazil, :master, :canad
         expect(@brazil_client.comments.first).to be_nil
       end
 
+      it 'where' do
+        expect(@brazil_client.comments.where('1=1')).to eq([@comment_brazil])
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1')).to be_empty
+      end
+
+      it 'map' do
+        expect(@brazil_client.comments.map(&:id)).to eq([@comment_brazil.id])
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.map(&:id)).to be_empty
+      end
+
+      it 'where + map' do
+        expect(@brazil_client.comments.where('1=1').map(&:id)).to eq([@comment_brazil.id])
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').map(&:id)).to be_empty
+      end
+
+      it 'where + each_with_index + map (enum method chain)' do
+        expect(@brazil_client.comments.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to eq([[@comment_brazil.id, 0]])
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').each_with_index.map { |r, i| [r.id, i]}).to be_empty
+      end
+
+      it 'where + sum' do
+        expect(@brazil_client.comments.where('1=1').sum(&:id)).to eq(@comment_brazil.id)
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').sum(&:id)).to eq(0)
+      end
+
+      it 'where + index_by' do
+        expect(@brazil_client.comments.where('1=1').index_by(&:id)).to eq(@comment_brazil.id => @comment_brazil)
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').index_by(&:id)).to be_empty
+      end
+
+      it 'where + find' do
+        expect(@brazil_client.comments.where('1=1').find(@comment_brazil.id)).to eq(@comment_brazil)
+        @brazil_client.comments.destroy_all
+        expect { @brazil_client.comments.where('1=1').find(@comment_brazil.id) }.to raise_error ActiveRecord::RecordNotFound
+      end
+
+      it 'where + find with block' do
+        expect(@brazil_client.comments.where('1=1').find { |c| c.id == @comment_brazil.id }).to eq(@comment_brazil)
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').find { |c| c.id == @comment_brazil.id }).to be_nil
+      end
+
+      it 'where + select' do
+        expect(@brazil_client.comments.where('1=1').select(:name).first.name).to eq(@comment_brazil.name)
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').select(:name)).to be_empty
+      end
+
+      it 'where + select with block' do
+        expect(@brazil_client.comments.where('1=1').select { |c| c.id == @comment_brazil.id }).to eq([@comment_brazil])
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').select { |c| c.id == @comment_brazil.id }).to be_empty
+      end
+
+      it 'where + any?' do
+        expect(@brazil_client.comments.where('1=1').any?).to be true
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').any?).to be false
+      end
+
+      it 'where + any? with block' do
+        expect(@brazil_client.comments.where('1=1').any? { |c| c.id == @comment_brazil.id }).to be true
+        @brazil_client.comments.destroy_all
+        expect(@brazil_client.comments.where('1=1').any? { |c| c.id == @comment_brazil.id }).to be false
+      end
+
       it 'exists?' do
         expect(@brazil_client.comments.exists?(@comment_brazil.id)).to be true
         @brazil_client.comments.destroy_all

data/spec/octopus/migration_spec.rb

@@ -1,5 +1,14 @@
 require 'spec_helper'
 
+def get_all_versions
+  if Octopus.atleast_rails52?
+    migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
+    ActiveRecord::MigrationContext.new(migrations_root).get_all_versions
+  else
+    ActiveRecord::Migrator.get_all_versions
+  end
+end
+
 describe Octopus::Migration do
   it 'should run just in the master shard' do
     OctopusHelper.migrating_to_version 1 do
@@ -32,8 +41,11 @@ describe Octopus::Migration do
 
   it "should rollback correctly migrations" do
     migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
-
-    ActiveRecord::Migrator.run(:up, migrations_root, 4)
+    if Octopus.atleast_rails52?
+      OctopusHelper.migrate_to_version(:up, migrations_root, 4)
+    else
+      ActiveRecord::Migrator.run(:up, migrations_root, 4)
+    end
 
     expect(User.using(:canada).find_by_name('Group')).not_to be_nil
     expect(User.using(:brazil).find_by_name('Group')).not_to be_nil
@@ -41,7 +53,11 @@ describe Octopus::Migration do
 
 
     Octopus.using(:canada) do
-      ActiveRecord::Migrator.rollback(migrations_root, 4)
+      if Octopus.atleast_rails52?
+        OctopusHelper.migrate_to_version(:down, migrations_root, 4)
+      else
+        ActiveRecord::Migrator.rollback(migrations_root, 4)
+      end
     end
 
     expect(User.using(:canada).find_by_name('Group')).to be_nil
@@ -99,9 +115,9 @@ describe Octopus::Migration do
     class SchemaMigration < ActiveRecord::Base; end
 
     OctopusHelper.migrating_to_version 14 do
-      expect(Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }).to include(14)
-      expect(Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }).to include(14)
-      expect(Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }).to include(14)
+      expect(Octopus.using(:canada) { get_all_versions }).to include(14)
+      expect(Octopus.using(:brazil) { get_all_versions }).to include(14)
+      expect(Octopus.using(:russia) { get_all_versions }).to include(14)
     end
   end
 
@@ -112,9 +128,9 @@ describe Octopus::Migration do
     Octopus.using(:canada) { SchemaMigration.create(:version => 14) }
 
     OctopusHelper.migrating_to_version 14 do
-      expect(Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }).to include(14)
-      expect(Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }).to include(14)
-      expect(Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }).to include(14)
+      expect(Octopus.using(:canada) { get_all_versions }).to include(14)
+      expect(Octopus.using(:brazil) { get_all_versions }).to include(14)
+      expect(Octopus.using(:russia) { get_all_versions }).to include(14)
     end
   end
 
@@ -122,13 +138,12 @@ describe Octopus::Migration do
     it 'should run migrations on all shards in the default_migration_group' do
       OctopusHelper.using_environment :octopus_with_default_migration_group do
         OctopusHelper.migrating_to_version 15 do
-          expect(Octopus.using(:master) { ActiveRecord::Migrator.get_all_versions }).not_to include(15)
-          expect(Octopus.using(:canada) { ActiveRecord::Migrator.get_all_versions }).to include(15)
-          expect(Octopus.using(:brazil) { ActiveRecord::Migrator.get_all_versions }).to include(15)
-          expect(Octopus.using(:russia) { ActiveRecord::Migrator.get_all_versions }).to include(15)
+          expect(Octopus.using(:master) { get_all_versions }).not_to include(15)
+          expect(Octopus.using(:canada) { get_all_versions }).to include(15)
+          expect(Octopus.using(:brazil) { get_all_versions }).to include(15)
+          expect(Octopus.using(:russia) { get_all_versions }).to include(15)
         end
       end
     end
   end
-
 end