intersection between a relation and an array works in both directions

Signed-off-by: N Mikel Lindsaar <raasdnil@gmail.com>

intersection between a relation and an array works in both directions
Signed-off-by: N Mikel Lindsaar <raasdnil@gmail.com>
a513f8f8 · Marcelo Giorgi · Mikel Lindsaar · 1c283765 · a513f8f8
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

activerecord/lib/active_record/relation/spawn_methods.rb activerecord/lib/active_record/relation/spawn_methods.rb +1 -0

未找到文件。
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -5,6 +5,7 @@ module SpawnMethods
    def merge(r)
      merged_relation = clone
      return merged_relation unless r
+      return to_a & r if r.is_a?(Array)

      Relation::ASSOCIATION_METHODS.each do |method|
        value = r.send(:"#{method}_values")