ar-octopus 0.9.2 → 0.10.0

data/spec/octopus/model_spec.rb

@@ -306,8 +306,13 @@ describe Octopus::Model do
 
   describe 'using a postgresql shard' do
     it 'should update the Arel Engine' do
-      expect(User.using(:postgresql_shard).arel_engine.connection.adapter_name).to eq('PostgreSQL')
-      expect(User.using(:alone_shard).arel_engine.connection.adapter_name).to eq('Mysql2')
+      if Octopus.atleast_rails52?
+        expect(User.using(:postgresql_shard).connection.adapter_name).to eq('PostgreSQL')
+        expect(User.using(:alone_shard).connection.adapter_name).to eq('Mysql2')
+      else 
+        expect(User.using(:postgresql_shard).arel_engine.connection.adapter_name).to eq('PostgreSQL')
+        expect(User.using(:alone_shard).arel_engine.connection.adapter_name).to eq('Mysql2')
+      end
     end
 
     it 'should works with writes and reads' do
@@ -393,6 +398,18 @@ describe Octopus::Model do
       expect(User.using(:master).maximum(:number)).to eq(12)
     end
 
+    it 'sum' do
+      u = User.using(:brazil).create!(:name => 'Teste', :number => 11)
+      v = User.using(:master).create!(:name => 'Teste', :number => 12)
+
+      expect(User.using(:master).sum(:number)).to eq(12)
+      expect(User.using(:brazil).sum(:number)).to eq(11)
+
+      expect(User.where(id: v.id).sum(:number)).to eq(12)
+      expect(User.using(:brazil).where(id: u.id).sum(:number)).to eq(11)
+      expect(User.using(:master).where(id: v.id).sum(:number)).to eq(12)
+    end
+
     describe 'any?' do
       before { User.using(:brazil).create!(:name => 'User1') }
 
@@ -747,7 +764,7 @@ describe Octopus::Model do
 
         replicated_cat = User.find_by_name 'Thiago'
 
-        expect(replicated_cat.current_shard.to_s).to match(/slave/)
+        expect(replicated_cat.current_shard.to_s).to match(/master/)
       end
     end
   end

data/spec/octopus/proxy_spec.rb

@@ -33,7 +33,7 @@ describe Octopus::Proxy do
       expect(config[:username]).to eq("#{ENV['MYSQL_USER'] || 'root'}")
     end
 
-    unless Octopus.rails50? || Octopus.rails51?
+    unless Octopus.rails50? || Octopus.rails51?|| Octopus.rails52?
       it 'should respond correctly to respond_to?(:pk_and_sequence_for)' do
         expect(proxy.respond_to?(:pk_and_sequence_for)).to be true
       end

data/spec/octopus/query_cache_for_shards_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+unless Octopus.rails4? || Octopus.rails50?
+  describe Octopus::ConnectionPool::QueryCacheForShards do
+    subject(:query_cache_on_shard) { ActiveRecord::Base.using(:brazil).connection.query_cache_enabled }
+
+    context 'Octopus enabled' do
+      context 'when query cache is enabled on the primary connection_pool' do
+        before { ActiveRecord::Base.connection_pool.enable_query_cache! }
+        it { is_expected.to be true }
+      end
+
+      context 'when query cache is disabled on the primary connection_pool' do
+        before { ActiveRecord::Base.connection_pool.disable_query_cache! }
+        it { is_expected.to be false }
+      end
+    end
+
+    context 'Octopus disabled' do
+      before do
+        Rails = double
+        allow(Rails).to receive(:env).and_return('staging')
+      end
+
+      after do
+        Object.send(:remove_const, :Rails)
+      end
+
+      context 'when query cache is enabled on the primary connection_pool' do
+        before { ActiveRecord::Base.connection_pool.enable_query_cache! }
+        it { is_expected.to be true }
+      end
+
+      context 'when query cache is disabled on the primary connection_pool' do
+        before { ActiveRecord::Base.connection_pool.disable_query_cache! }
+        it { is_expected.to be false }
+      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)
@@ -44,7 +99,7 @@ describe 'when the database is replicated' do
 
           # 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? ? 19 : 14
+          expected_records = Octopus.rails51? || Octopus.rails52? ? 19 : 14
 
           expect(counter.query_count).to eq(expected_records)
         end

data/spec/octopus/scope_proxy_spec.rb

@@ -73,4 +73,25 @@ describe Octopus::ScopeProxy do
       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/support/octopus_helper.rb

@@ -8,12 +8,12 @@ module OctopusHelper
       %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
 
@@ -29,12 +29,21 @@ module OctopusHelper
 
   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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,16 +58,22 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.18
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -174,11 +180,10 @@ files:
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
-- gemfiles/rails4.gemfile
-- gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails5.gemfile
 - gemfiles/rails51.gemfile
+- gemfiles/rails52.gemfile
 - lib/ar-octopus.rb
 - lib/octopus.rb
 - lib/octopus/abstract_adapter.rb
@@ -188,7 +193,6 @@ files:
 - lib/octopus/collection_proxy.rb
 - lib/octopus/exception.rb
 - lib/octopus/finder_methods.rb
-- lib/octopus/has_and_belongs_to_many_association.rb
 - lib/octopus/load_balancing.rb
 - lib/octopus/load_balancing/round_robin.rb
 - lib/octopus/log_subscriber.rb
@@ -197,6 +201,7 @@ files:
 - 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
@@ -307,6 +312,7 @@ files:
 - 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
@@ -337,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -374,6 +380,7 @@ test_files:
 - 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/gemfiles/rails41.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.0"
-
-gemspec :path => "../"

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)