Don't merge reflection_scope if reflection.scope isn't given

If `reflection.scope` isn't given, `reflection_scope` is always `klass.unscoped`. it is unnecessary to merge it.
rails · Sep 4, 2017 · 2b5f5cd · 2b5f5cd
1 parent 9551bad
commit 2b5f5cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -123,7 +123,7 @@ def build_scope
               scope.where!(reflection.type => model.base_class.sti_name)
             end
 
-            scope.merge!(reflection_scope)
+            scope.merge!(reflection_scope) if reflection.scope
             scope.merge!(preload_scope) if preload_scope
             scope
           end