Revert "Merge pull request rails#34538 from bogdan/reuse-find-target"

kamipo · kamipo · commit 93c94973ab57 · 2018-11-28T01:09:35.000+09:00
This reverts commit f2ab8b6, reversing changes made to b9c7305. Reason: `scope.take` is not the same with `scope.to_a.first`.
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
@@ -179,23 +179,6 @@ def create!(attributes = {}, &block)
       end
 
       private
-
-        def find_target
-          scope = self.scope
-          return scope.to_a if skip_statement_cache?(scope)
-
-          conn = klass.connection
-          sc = reflection.association_scope_cache(conn, owner) do |params|
-            as = AssociationScope.create { params.bind }
-            target_scope.merge!(as.scope(self))
-          end
-
-          binds = AssociationScope.get_bind_values(owner, reflection.chain)
-          sc.execute(binds, conn) do |record|
-            set_inverse_instance(record)
-          end
-        end
-
         # The scope for this association.
         #
         # Note that the association_scope is merged into the target_scope only when the
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
@@ -303,6 +303,21 @@ def find_from_target?
       end
 
       private
+        def find_target
+          scope = self.scope
+          return scope.to_a if skip_statement_cache?(scope)
+
+          conn = klass.connection
+          sc = reflection.association_scope_cache(conn, owner) do |params|
+            as = AssociationScope.create { params.bind }
+            target_scope.merge!(as.scope(self))
+          end
+
+          binds = AssociationScope.get_bind_values(owner, reflection.chain)
+          sc.execute(binds, conn) do |record|
+            set_inverse_instance(record)
+          end
+        end
 
         # We have some records loaded from the database (persisted) and some that are
         # in-memory (memory). The same record may be represented in the persisted array
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
@@ -31,17 +31,24 @@ def force_reload_reader
       end
 
       private
-
-        def target_scope
-          super.limit!(1)
-        end
-
         def scope_for_create
           super.except!(klass.primary_key)
         end
 
         def find_target
-          super.first
+          scope = self.scope
+          return scope.take if skip_statement_cache?(scope)
+
+          conn = klass.connection
+          sc = reflection.association_scope_cache(conn, owner) do |params|
+            as = AssociationScope.create { params.bind }
+            target_scope.merge!(as.scope(self)).limit(1)
+          end
+
+          binds = AssociationScope.get_bind_values(owner, reflection.chain)
+          sc.execute(binds, conn) do |record|
+            set_inverse_instance record
+          end.first
         rescue ::RangeError
           nil
         end
