activerecord-turntable 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9d385f15413261bc87c1e2444193c53a9ee657
-  data.tar.gz: '009577b936eded2be655a3b850787a14dfd03cbf'
+  metadata.gz: 7bae4fd19e4b7b55c12f1793b954e711e0c9693b
+  data.tar.gz: b5da25ad60b9b02b3d6483f59d940a87a832d65f
 SHA512:
-  metadata.gz: ce1c55a07c1b94377e206d4cf97b2fbb961bb0bf1025d0150c540771eff0fa56df3f0360741b4102aaef698c5913da463fc459c23016b7c28c699fac79e5c548
-  data.tar.gz: e74cfd821f2c84ddeec7a950335a017f8cc058cece9daee3ce2f5c3a67a3969009a5486714cd822eef412c6f01f595e001f8685f1bce4cdb82f750951ea008e5
+  metadata.gz: 7bef5cc2a9020bfb5f7158cef8c6935359c3bc77d8e9f7b28dfc88375eccdb9dfde5f7ae2becbf48fc07af6fd793b492f3c13735c982cfab9f1e501939c6550a
+  data.tar.gz: 3fda72ec78a460652cd460426f04a35bdb473f96f3bcd1241e594fc5ba401e5c619789dbe28d16652dd649eb78b98bb60ebd98919a691bee43eab4c25c8814c8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## activerecord-turntable 2.5.0 ##
+
+### Improvement
+
+* Fix to propagate shard conditions to `AssociationRelation` too
+
 ## activerecord-turntable 2.4.0 ##
 
 ### Incompatible Change

data/lib/active_record/turntable.rb

@@ -38,6 +38,7 @@ module ActiveRecord::Turntable
     autoload :Mixer
     autoload :PoolProxy
     autoload :Shard
+    autoload :ShardingCondition
     autoload :SeqShard
     autoload :Sequencer
   end

data/lib/active_record/turntable/active_record_ext.rb

@@ -31,7 +31,7 @@ module ActiveRecord::Turntable
         include ConnectionHandlerExtension
       end
       ActiveRecord::Associations::Preloader::Association.send(:include, AssociationPreloader)
-      ActiveRecord::Associations::Association.send(:include, Association)
+      ActiveRecord::Associations::Association.send(:prepend, Association)
       require 'active_record/turntable/active_record_ext/fixtures'
       require 'active_record/turntable/active_record_ext/migration_proxy'
       require 'active_record/turntable/active_record_ext/activerecord_import_ext'

data/lib/active_record/turntable/active_record_ext/association.rb

@@ -1,139 +1,32 @@
-require 'active_record/associations'
+require "active_record/associations"
 
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module Association
-      extend ActiveSupport::Concern
+      include ShardingCondition
 
-      included do
-        ActiveRecord::Associations::SingularAssociation.send(:include, SingularAssociationExt)
-        ActiveRecord::Associations::CollectionAssociation.send(:include, CollectionAssociationExt)
-        ActiveRecord::Associations::Builder::Association.valid_options += [:foreign_shard_key]
+      def self.prepended(mod)
+        ActiveRecord::Associations::Builder::Association.valid_options << :foreign_shard_key
       end
 
-      private
-
-      def turntable_scope(scope, bind = nil)
-        if should_use_shard_key?
-          scope = scope.where(klass.turntable_shard_key => owner.send(foreign_shard_key))
-        end
-        scope
-      end
-
-      module SingularAssociationExt
-        extend ActiveSupport::Concern
-
-        included do
-          if Util.ar42_or_later?
-            alias_method_chain :get_records, :turntable
-          else
-            alias_method_chain :find_target, :turntable
-          end
-        end
-
-        # @note Override to add sharding condition for singular association
-        if Util.ar42_or_later?
-          def get_records_with_turntable
-            if reflection.scope_chain.any?(&:any?) ||
-                scope.eager_loading? ||
-                klass.current_scope ||
-                klass.default_scopes.any? ||
-                should_use_shard_key? # OPTIMIZE: Use bind values if cachable scope
-
-              return turntable_scope(scope).limit(1).to_a
-            end
-
-            conn = klass.connection
-            sc = reflection.association_scope_cache(conn, owner) do
-              ActiveRecord::StatementCache.create(conn) { |params|
-                as = ActiveRecord::Associations::AssociationScope.create { params.bind }
-                target_scope.merge(as.scope(self, conn)).limit(1)
-              }
-            end
-
-            binds = ActiveRecord::Associations::AssociationScope.get_bind_values(owner, reflection.chain)
-            sc.execute binds, klass, klass.connection
-          end
-        elsif Util.ar41_or_later?
-          def find_target_with_turntable
-            if record = turntable_scope(scope).take
-              set_inverse_instance record
-            end
-          end
-        else
-          def find_target_with_turntable
-            turntable_scope(scope).take.tap { |record| set_inverse_instance(record) }
-          end
-        end
-      end
+      protected
 
-      module CollectionAssociationExt
-        extend ActiveSupport::Concern
+        # @note Override to pass shard key conditions
+        def target_scope
+          return super unless should_use_shard_key?
 
-        included do
-          if Util.ar42_or_later?
-            alias_method_chain :get_records, :turntable
-          else
-            alias_method_chain :find_target, :turntable
-          end
+          scope = klass.where(
+                    klass.turntable_shard_key =>
+                      owner.send(foreign_shard_key)
+                  )
+          super.merge!(scope)
         end
 
-        private
-
-        if Util.ar42_or_later?
-          def get_records_with_turntable
-            if reflection.scope_chain.any?(&:any?) ||
-                scope.eager_loading? ||
-                klass.current_scope ||
-                klass.default_scopes.any? ||
-                should_use_shard_key? # OPTIMIZE: Use bind values if cachable scope
-
-              return turntable_scope(scope).to_a
-            end
-
-            conn = klass.connection
-            sc = reflection.association_scope_cache(conn, owner) do
-              ActiveRecord::StatementCache.create(conn) { |params|
-                as = ActiveRecord::Associations::AssociationScope.create { params.bind }
-                target_scope.merge as.scope(self, conn)
-              }
-            end
-
-            binds = ActiveRecord::Associations::AssociationScope.get_bind_values(owner, reflection.chain)
-            sc.execute binds, klass, klass.connection
-          end
-        else
-          # @note Override to add sharding condition for collection association
-          def find_target_with_turntable
-            records =
-              if options[:finder_sql]
-                reflection.klass.find_by_sql(custom_finder_sql)
-              else
-                current_scope = scope
-                if should_use_shard_key?
-                  current_scope = current_scope.where(klass.turntable_shard_key => owner.send(foreign_shard_key))
-                end
-                current_scope.to_a
-              end
-            records.each { |record| set_inverse_instance(record) }
-            records
-          end
-        end
-      end
-
       private
 
-      def foreign_shard_key
-        options[:foreign_shard_key] || owner.turntable_shard_key
-      end
-
-      def should_use_shard_key?
-        same_association_shard_key? || !!options[:foreign_shard_key]
-      end
-
-      def same_association_shard_key?
-        owner.class.turntable_enabled? && klass.turntable_enabled? && foreign_shard_key == klass.turntable_shard_key
-      end
+        def skip_statement_cache?
+          super || should_use_shard_key?
+        end
     end
   end
 end

data/lib/active_record/turntable/sharding_condition.rb

@@ -0,0 +1,23 @@
+module ActiveRecord::Turntable
+  module ShardingCondition
+    private
+
+    def foreign_shard_key
+      options[:foreign_shard_key] || foreign_target_model.turntable_shard_key
+    end
+
+    def foreign_target_model
+      respond_to?(:model) ? model : owner
+    end
+
+    def should_use_shard_key?
+      sharded_by_same_key? || !!options[:foreign_shard_key]
+    end
+
+    def sharded_by_same_key?
+      foreign_target_model.turntable_enabled? &&
+        klass.turntable_enabled? &&
+        foreign_shard_key == klass.turntable_shard_key
+    end
+  end
+end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.4.0"
+    VERSION = "2.5.0"
   end
 end

data/spec/active_record/turntable/active_record_ext/association_spec.rb

@@ -47,11 +47,20 @@ describe ActiveRecord::Turntable::ActiveRecordExt::Association do
       ActiveRecord::Base.turntable_config.instance_variable_get(:@config)[:raise_on_not_specified_shard_query] = true
     end
     let(:cards_user) { CardsUser.where(user: user).first }
+    let(:cards_users_history) { cards_users_histories.find { |history| history.user_id == user.id } }
 
     context "associated objects has same turntable_key" do
-      subject { cards_user.cards_users_histories.to_a }
-      it { expect { subject }.to_not raise_error }
-      it { is_expected.to include(*cards_users_histories.select { |history| history.cards_user_id == cards_user.id }) }
+      context "AssociationRelation#to_a" do
+        subject { cards_user.cards_users_histories.to_a }
+        it { expect { subject }.to_not raise_error }
+        it { is_expected.to include(*cards_users_histories.select { |history| history.cards_user_id == cards_user.id }) }
+      end
+
+      context "AssociationRelation#where" do
+        subject { cards_user.cards_users_histories.where(id: cards_users_history.id).to_a }
+        it { expect { subject }.to_not raise_error }
+        it { is_expected.to include(cards_users_history) }
+      end
     end
 
     context "associated objects has different turntable_key" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -412,6 +412,7 @@ files:
 - lib/active_record/turntable/sequencer/barrage.rb
 - lib/active_record/turntable/sequencer/mysql.rb
 - lib/active_record/turntable/shard.rb
+- lib/active_record/turntable/sharding_condition.rb
 - lib/active_record/turntable/sql_tree_patch.rb
 - lib/active_record/turntable/util.rb
 - lib/active_record/turntable/version.rb