making relationship merge cheaper

rails · Nov 30, 2010 · 8998aea · 8998aea
1 parent b6848b6
commit 8998aea
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -3,10 +3,11 @@
 module ActiveRecord
   module SpawnMethods
     def merge(r)
-      merged_relation = clone
-      return merged_relation unless r
+      return self unless r
       return to_a & r if r.is_a?(Array)
 
+      merged_relation = clone
+
       Relation::ASSOCIATION_METHODS.each do |method|
         value = r.send(:"#{method}_values")
 
@@ -24,7 +25,7 @@ def merge(r)
         merged_relation.send(:"#{method}_values=", merged_relation.send(:"#{method}_values") + value) if value.present?
       end
 
-      merged_relation = merged_relation.joins(r.joins_values)
+      merged_relation.joins_values += r.joins_values
 
       merged_wheres = @where_values + r.where_values