ar-octopus 0.8.5 → 0.10.2

data/spec/octopus/replicated_slave_grouped_spec.rb

@@ -61,4 +61,31 @@ describe 'when the database is replicated and has slave groups' do
       expect(Cat.count).to eq(2)
     end
   end
+
+  it 'should keep sending to slaves in a using block' do
+    OctopusHelper.using_environment :replicated_slave_grouped do
+      Cat.create!(:name => 'Thiago1')
+      Cat.create!(:name => 'Thiago2')
+
+      expect(Cat.count).to eq(2)
+      Octopus.using(:slave_group => :slaves1) do
+        expect(Cat.count).to eq(0)
+        expect(Cat.count).to eq(0)
+      end
+    end
+  end
+  
+  it 'should restore previous slave group after a using block' do
+    OctopusHelper.using_environment :replicated_slave_grouped do
+      Cat.create!(:name => 'Thiago1')
+      Cat.create!(:name => 'Thiago2')
+
+      Octopus.using(:slave_group => :slaves1) do
+        Octopus.using(:slave_group => :slaves2) do
+          expect(Cat.count).to eq(2)
+        end
+        expect(Cat.count).to eq(0)
+      end
+    end
+  end
 end

data/spec/octopus/replication_spec.rb

@@ -1,6 +1,22 @@
 require 'spec_helper'
 
 describe 'when the database is replicated' do
+  let(:slave_pool) do
+    ActiveRecord::Base.connection_proxy.shards['slave1']
+  end
+
+  let(:slave_connection) do
+    slave_pool.connection
+  end
+
+  let(:master_pool) do
+    ActiveRecord::Base.connection_proxy.shards['master']
+  end
+
+  let(:master_connection) do
+    master_pool.connection
+  end
+
   it 'should send all writes/reads queries to master when you have a non replicated model' do
     OctopusHelper.using_environment :production_replicated do
       u = User.create!(:name => 'Replicated')
@@ -26,10 +42,49 @@ describe 'when the database is replicated' do
     end
   end
 
+  context 'when updating model' do
+    it 'should send writes to master' do
+      OctopusHelper.using_environment :replicated_with_one_slave do
+        Cat.using(:slave1).create!(:name => 'Cat')
+        cat = Cat.find_by_name('Cat')
+        cat.name = 'New name'
+
+        expect(master_connection).to receive(:update).and_call_original
+
+        cat.save!
+      end
+    end
+  end
+
+  context 'when querying' do
+    it 'Reads from slave' do
+      OctopusHelper.using_environment :replicated_with_one_slave do
+        expect(master_connection).not_to receive(:select)
+
+        Cat.where(:name => 'Catman2').first
+      end
+    end
+  end
+
+  context 'When record is read from slave' do
+    it 'Should write associations to master' do
+      OctopusHelper.using_environment :replicated_with_one_slave do
+        client = Client.using(:slave1).create!(:name => 'Client')
+
+        client = Client.find(client.id)
+
+        expect(master_connection).to receive(:insert).and_call_original
+
+        client.items.create!(:name => 'Item')
+      end
+    end
+  end
+
+
   describe 'When enabling the query cache' do
     include_context 'with query cache enabled' do
       it 'should do the queries with cache' do
-        OctopusHelper.using_environment :replicated_with_one_slave  do
+        OctopusHelper.using_environment :replicated_with_one_slave do
           cat1 = Cat.using(:master).create!(:name => 'Master Cat 1')
           _ct2 = Cat.using(:master).create!(:name => 'Master Cat 2')
           expect(Cat.using(:master).find(cat1.id)).to eq(cat1)
@@ -42,7 +97,11 @@ describe 'when the database is replicated' do
           expect(Cat.find(cat3.id).id).to eq(cat3.id)
           expect(Cat.find(cat3.id).id).to eq(cat3.id)
 
-          expect(counter.query_count).to eq(14)
+          # Rails 5.1 count the cached queries as regular queries.
+          # TODO: How we can verify if the queries are using cache on Rails 5.1? - @thiagopradi
+          expected_records = Octopus.rails51? || Octopus.rails52? ? 19 : 14
+
+          expect(counter.query_count).to eq(expected_records)
         end
       end
     end
@@ -123,4 +182,15 @@ describe 'when the database is replicated and the entire application is replicat
       expect(Cat.connection.current_shard).to eql(:master)
     end
   end
+
+  it 'should reset current shard if slave throws an exception with custom master' do
+    OctopusHelper.using_environment :production_fully_replicated do
+      Octopus.config[:master_shard] = :slave2
+      Cat.create!(:name => 'Slave Cat')
+      expect(Cat.connection.current_shard).to eql(:slave2)
+      Cat.where(:rubbish => true)
+      expect(Cat.connection.current_shard).to eql(:slave2)
+      Octopus.config[:master_shard] = nil
+    end
+  end
 end

data/spec/octopus/scope_proxy_spec.rb

@@ -46,18 +46,52 @@ describe Octopus::ScopeProxy do
       expect(@evan.select(%w(id name)).first.id).to be_a(Fixnum)
     end
 
-    if Octopus.rails4?
-      it 'allows multiple selection by symbol' do
-        expect(@evan.select(:id, :name).first.id).to be_a(Fixnum)
-      end
+    it 'allows multiple selection by symbol' do
+      expect(@evan.select(:id, :name).first.id).to be_a(Fixnum)
+    end
 
-      it 'allows multiple selection by string and symbol' do
-        expect(@evan.select(:id, 'name').first.id).to be_a(Fixnum)
-      end
+    it 'allows multiple selection by string and symbol' do
+      expect(@evan.select(:id, 'name').first.id).to be_a(Fixnum)
     end
   end
 
   it "should raise a exception when trying to send a query to a shard that don't exists" do
     expect { User.using(:dont_exists).all }.to raise_exception('Nonexistent Shard Name: dont_exists')
   end
+
+  context "dup / clone" do
+    before(:each) do
+      User.using(:brazil).create!(:name => 'Thiago', :number => 1)
+    end
+
+    it "should change it's object id" do
+      user = User.using(:brazil).where(id: 1)
+      dupped_object = user.dup
+      cloned_object = user.clone
+
+      expect(dupped_object.object_id).not_to eq(user.object_id)
+      expect(cloned_object.object_id).not_to eq(user.object_id)
+    end
+  end
+
+  context 'When iterated with Enumerable methods' do
+    before(:each) do
+      User.using(:brazil).create!(:name => 'Evan', :number => 1)
+      User.using(:brazil).create!(:name => 'Evan', :number => 2)
+      User.using(:brazil).create!(:name => 'Evan', :number => 3)
+      @evans = User.using(:brazil).where(:name => 'Evan')
+    end
+
+    it 'allows each method' do
+      expect(@evans.each.count).to eq(3)
+    end
+
+    it 'allows each_with_index method' do
+      expect(@evans.each_with_index.to_a.flatten.count).to eq(6)
+    end
+
+    it 'allows map method' do
+      expect(@evans.map(&:number)).to eq([1, 2, 3])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require 'octopus'
 
 Octopus.instance_variable_set(:@directory, File.dirname(__FILE__))
 
+BaseOctopusMigrationClass = (Octopus.rails4? ? ActiveRecord::Migration : ActiveRecord::Migration[ActiveRecord::VERSION::STRING[0..2]])
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/database_connection.rb

@@ -1,4 +1,4 @@
 require 'logger'
 
-ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_1', :username => 'root', :password => '')
+ActiveRecord::Base.establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_1', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => '')
 ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))

data/spec/support/database_models.rb

@@ -28,7 +28,7 @@ end
 # This class sets its own connection
 class CustomConnection < ActiveRecord::Base
   self.table_name = 'custom'
-  octopus_establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_2', :username => 'root', :password => '')
+  octopus_establish_connection(:adapter => 'mysql2', :database => 'octopus_shard_2', :username => "#{ENV['MYSQL_USER'] || 'root'}", :password => '')
 end
 
 # This items belongs to a client

data/spec/support/octopus_helper.rb

@@ -1,19 +1,19 @@
 module OctopusHelper
   def self.clean_all_shards(shards)
     if shards.nil?
-      shards = BlankModel.using(:master).connection.instance_variable_get(:@shards).keys
+      shards = BlankModel.using(:master).connection.shards.keys
     end
 
     shards.each do |shard_symbol|
       %w(schema_migrations users clients cats items keyboards computers permissions_roles roles permissions assignments projects programmers yummy adverts).each do |tables|
         BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
       end
-
       if shard_symbol == 'alone_shard'
         %w(mmorpg_players weapons skills).each do |table|
           BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{table}")
         end
       end
+      BlankModel.using(:master).connection.shards[shard_symbol].disconnect if Octopus.atleast_rails50?
     end
   end
 
@@ -23,19 +23,27 @@ module OctopusHelper
     Thread.current['octopus.current_group'] = nil
     Thread.current['octopus.current_slave_group'] = nil
     Thread.current['octopus.block'] = nil
-    Thread.current['octopus.last_current_shard'] = nil
 
     ActiveRecord::Base.class_variable_set(:@@connection_proxy, nil)
   end
 
   def self.migrating_to_version(version, &_block)
     migrations_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'migrations'))
-
+    
     begin
-      ActiveRecord::Migrator.run(:up, migrations_root, version)
+      migrate_to_version(:up, migrations_root, version)
       yield
     ensure
-      ActiveRecord::Migrator.run(:down, migrations_root, version)
+      migrate_to_version(:down, migrations_root, version)
+    end
+  end
+  
+  def self.migrate_to_version(direction, root, version)
+    if Octopus.atleast_rails52?
+      migrations = ActiveRecord::MigrationContext.new(root).migrations.select {|mig| version == mig.version }
+      ActiveRecord::Migrator.new(direction, migrations, version).run
+    else 
+      ActiveRecord::Migrator.run(direction, root, version)
     end
   end
 

data/spec/tasks/octopus.rake_spec.rb

@@ -25,7 +25,7 @@ describe 'octopus.rake' do
       Rake::Task['octopus:copy_schema_versions'].invoke
 
       ActiveRecord::Base.connection.shard_names.each do |shard_name|
-        expect(Octopus.using(shard_name) { ActiveRecord::Migrator.get_all_versions }).to eq([1, 2, 3])
+        expect(Octopus.using(shard_name) { ActiveRecord::SchemaMigration.all.pluck(:version).map(&:to_i).sort }).to eq([1, 2, 3])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.10.2
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,44 +58,50 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.18
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,16 +134,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +173,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - Gemfile
@@ -175,11 +180,10 @@ files:
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
-- gemfiles/rails32.gemfile
-- gemfiles/rails4.gemfile
-- gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
-- init.rb
+- gemfiles/rails5.gemfile
+- gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/ar-octopus.rb
 - lib/octopus.rb
 - lib/octopus/abstract_adapter.rb
@@ -187,7 +191,8 @@ files:
 - lib/octopus/association_shard_tracking.rb
 - lib/octopus/collection_association.rb
 - lib/octopus/collection_proxy.rb
-- lib/octopus/has_and_belongs_to_many_association.rb
+- lib/octopus/exception.rb
+- lib/octopus/finder_methods.rb
 - lib/octopus/load_balancing.rb
 - lib/octopus/load_balancing/round_robin.rb
 - lib/octopus/log_subscriber.rb
@@ -195,8 +200,11 @@ files:
 - lib/octopus/model.rb
 - lib/octopus/persistence.rb
 - lib/octopus/proxy.rb
+- lib/octopus/proxy_config.rb
+- lib/octopus/query_cache_for_shards.rb
 - lib/octopus/railtie.rb
 - lib/octopus/relation_proxy.rb
+- lib/octopus/result_patch.rb
 - lib/octopus/scope_proxy.rb
 - lib/octopus/shard_tracking.rb
 - lib/octopus/shard_tracking/attribute.rb
@@ -205,7 +213,6 @@ files:
 - lib/octopus/slave_group.rb
 - lib/octopus/version.rb
 - lib/tasks/octopus.rake
-- rails/init.rb
 - sample_app/.gitignore
 - sample_app/.rspec
 - sample_app/Gemfile
@@ -299,11 +306,13 @@ files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_shard_tracking_spec.rb
 - spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/query_cache_for_shards_spec.rb
 - spec/octopus/relation_proxy_spec.rb
 - spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb
@@ -334,15 +343,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Easy Database Sharding for ActiveRecord
@@ -365,11 +373,13 @@ test_files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_shard_tracking_spec.rb
 - spec/octopus/collection_proxy_spec.rb
+- spec/octopus/load_balancing/round_robin_spec.rb
 - spec/octopus/log_subscriber_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
 - spec/octopus/proxy_spec.rb
+- spec/octopus/query_cache_for_shards_spec.rb
 - spec/octopus/relation_proxy_spec.rb
 - spec/octopus/replicated_slave_grouped_spec.rb
 - spec/octopus/replication_spec.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')

data/lib/octopus/has_and_belongs_to_many_association.rb

@@ -1,9 +0,0 @@
-module Octopus
-  module HasAndBelongsToManyAssociation
-    def self.included(base)
-      base.sharded_methods :insert_record
-    end
-  end
-end
-
-ActiveRecord::Associations::HasAndBelongsToManyAssociation.send(:include, Octopus::HasAndBelongsToManyAssociation)

data/rails/init.rb

@@ -1 +0,0 @@
-require 'octopus'